equal
deleted
inserted
replaced
125 1 new unstable changesets |
125 1 new unstable changesets |
126 $ hg evolve |
126 $ hg evolve |
127 move:[5] babar count up to fifteen |
127 move:[5] babar count up to fifteen |
128 atop:[7] babar count up to ten |
128 atop:[7] babar count up to ten |
129 merging babar |
129 merging babar |
130 warning: conflicts while merging babar! (edit, then use 'hg resolve --mark') |
130 warning: conflicts during merge. |
|
131 merging babar incomplete! (edit conflicts, then use 'hg resolve --mark') |
131 evolve failed! |
132 evolve failed! |
132 fix conflict and run "hg evolve --continue" or use "hg update -C" to abort |
133 fix conflict and run "hg evolve --continue" or use "hg update -C" to abort |
133 abort: unresolved merge conflicts (see hg help resolve) |
134 abort: unresolved merge conflicts (see hg help resolve) |
134 [255] |
135 [255] |
135 $ hg resolve -l |
136 $ hg resolve -l |