equal
deleted
inserted
replaced
83 atop:[7] changea |
83 atop:[7] changea |
84 merging a |
84 merging a |
85 warning: conflicts during merge. |
85 warning: conflicts during merge. |
86 merging a incomplete! (edit conflicts, then use 'hg resolve --mark') |
86 merging a incomplete! (edit conflicts, then use 'hg resolve --mark') |
87 evolve failed! |
87 evolve failed! |
88 fix conflict and run "hg evolve --continue" |
88 fix conflict and run "hg evolve --continue" or use "hg update -C" to abort |
89 abort: unresolved merge conflicts (see hg help resolve) |
89 abort: unresolved merge conflicts (see hg help resolve) |
90 [255] |
90 [255] |
91 $ hg revert -r 'unstable()' a |
91 $ hg revert -r 'unstable()' a |
92 $ hg diff |
92 $ hg diff |
93 diff -r 66719795a494 a |
93 diff -r 66719795a494 a |