equal
deleted
inserted
replaced
91 a |
91 a |
92 +a |
92 +a |
93 +newer a |
93 +newer a |
94 $ hg evolve --continue |
94 $ hg evolve --continue |
95 grafting 5:3655f0f50885 "newer a" |
95 grafting 5:3655f0f50885 "newer a" |
96 abort: unresolved merge conflicts (see hg help resolve) |
96 abort: unresolved merge conflicts (see "hg help resolve") |
97 [255] |
97 [255] |
98 $ hg resolve -m a |
98 $ hg resolve -m a |
99 (no more unresolved files) |
99 (no more unresolved files) |
100 $ hg evolve --continue |
100 $ hg evolve --continue |
101 grafting 5:3655f0f50885 "newer a" |
101 grafting 5:3655f0f50885 "newer a" |
254 merging divergent changeset |
254 merging divergent changeset |
255 resolving manifests |
255 resolving manifests |
256 merging a |
256 merging a |
257 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
257 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
258 amending changeset eacc9c8240fe |
258 amending changeset eacc9c8240fe |
|
259 committing files: |
259 a |
260 a |
|
261 committing manifest |
|
262 committing changelog |
260 copying changeset 283ccd10e2b8 to 7bc2f5967f5e |
263 copying changeset 283ccd10e2b8 to 7bc2f5967f5e |
|
264 committing files: |
261 a |
265 a |
|
266 committing manifest |
|
267 committing changelog |
262 committed changeset 21:f344982e63c4 |
268 committed changeset 21:f344982e63c4 |
263 working directory is now at f344982e63c4 |
269 working directory is now at f344982e63c4 |
264 $ hg st |
270 $ hg st |
265 $ glog |
271 $ glog |
266 @ 21:f344982e63c4@default(draft) bk:[] More addition |
272 @ 21:f344982e63c4@default(draft) bk:[] More addition |