equal
deleted
inserted
replaced
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 during merge. |
130 warning: conflicts during merge. |
131 merging babar incomplete! (edit conflicts, then use 'hg resolve --mark') |
131 merging babar incomplete! (edit conflicts, then use 'hg resolve --mark') |
132 evolve failed! |
132 evolve failed! |
133 fix conflict and run "hg evolve --continue" |
133 fix conflict and run "hg evolve --continue" or use "hg update -C" to abort |
134 abort: unresolved merge conflicts (see hg help resolve) |
134 abort: unresolved merge conflicts (see hg help resolve) |
135 [255] |
135 [255] |
136 $ hg resolve -l |
136 $ hg resolve -l |
137 U babar |
137 U babar |
138 $ hg log -G |
138 $ hg log -G |
218 merging babar |
218 merging babar |
219 output file babar appears unchanged |
219 output file babar appears unchanged |
220 was merge successful (yn)? n |
220 was merge successful (yn)? n |
221 merging babar failed! |
221 merging babar failed! |
222 evolve failed! |
222 evolve failed! |
223 fix conflict and run "hg evolve --continue" |
223 fix conflict and run "hg evolve --continue" or use "hg update -C" to abort |
224 abort: unresolved merge conflicts (see hg help resolve) |
224 abort: unresolved merge conflicts (see hg help resolve) |
225 [255] |
225 [255] |
226 $ hg resolve -l |
226 $ hg resolve -l |
227 U babar |
227 U babar |
228 $ hg log -G |
228 $ hg log -G |