equal
deleted
inserted
replaced
82 recreate:[6] added d |
82 recreate:[6] added d |
83 atop:[4] added d |
83 atop:[4] added d |
84 rebasing to destination parent: ca1b80f7960a |
84 rebasing to destination parent: ca1b80f7960a |
85 merging c |
85 merging c |
86 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
86 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
87 evolution failed! |
87 abort: fix conflicts and see `hg help evolve.interrupted` |
88 fix conflict then run 'hg evolve --continue' or use `hg evolve --abort` |
|
89 abort: unresolved merge conflicts (see hg help resolve) |
|
90 [255] |
88 [255] |
91 |
89 |
92 $ hg evolve --stop |
90 $ hg evolve --stop |
93 stopped the interrupted evolve |
91 stopped the interrupted evolve |
94 working directory is now at ca1b80f7960a |
92 working directory is now at ca1b80f7960a |