equal
deleted
inserted
replaced
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 while merging a! (edit, then use 'hg resolve --mark') |
85 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
86 evolve failed! |
86 evolve failed! |
87 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 |
88 abort: unresolved merge conflicts (see hg help resolve) |
88 abort: unresolved merge conflicts (see hg help resolve) |
89 [255] |
89 [255] |
90 $ hg revert -r 'unstable()' a |
90 $ hg revert -r 'unstable()' a |
91 $ hg diff |
91 $ hg diff |
92 diff -r 66719795a494 a |
92 diff -r 66719795a494 a |