equal
deleted
inserted
replaced
80 1 new unstable changesets |
80 1 new unstable changesets |
81 $ hg evolve |
81 $ hg evolve |
82 move:[5] newer a |
82 move:[5] newer a |
83 atop:[7] changea |
83 atop:[7] changea |
84 merging a |
84 merging a |
85 warning: conflicts during merge. |
85 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
86 merging a incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
87 evolve failed! |
86 evolve failed! |
88 fix conflict and run "hg evolve --continue" or use "hg update -C" to abort |
87 fix conflict and run "hg evolve --continue" or use "hg update -C" to abort |
89 abort: unresolved merge conflicts (see hg help resolve) |
88 abort: unresolved merge conflicts (see hg help resolve) |
90 [255] |
89 [255] |
91 $ hg revert -r 'unstable()' a |
90 $ hg revert -r 'unstable()' a |
356 $ hg evolve --divergent |
355 $ hg evolve --divergent |
357 merge:[24] More addition (2) |
356 merge:[24] More addition (2) |
358 with: [21] More addition |
357 with: [21] More addition |
359 base: [15] More addition |
358 base: [15] More addition |
360 merging a |
359 merging a |
361 warning: conflicts during merge. |
360 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
362 merging a incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
363 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
361 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
364 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
362 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
365 abort: merge conflict between several amendments (this is not automated yet) |
363 abort: merge conflict between several amendments (this is not automated yet) |
366 (/!\ You can try: |
364 (/!\ You can try: |
367 /!\ * manual merge + resolve => new cset X |
365 /!\ * manual merge + resolve => new cset X |