equal
deleted
inserted
replaced
215 > EOF |
215 > EOF |
216 move:[8] babar count up to fifteen |
216 move:[8] babar count up to fifteen |
217 atop:[10] babar count up to ten |
217 atop:[10] babar count up to ten |
218 merging babar |
218 merging babar |
219 output file babar appears unchanged |
219 output file babar appears unchanged |
220 was merge successful (yn)? merging babar failed! |
220 was merge successful (yn)? n |
|
221 merging babar failed! |
221 evolve failed! |
222 evolve failed! |
222 fix conflict and run "hg evolve --continue" |
223 fix conflict and run "hg evolve --continue" |
223 abort: unresolved merge conflicts (see hg help resolve) |
224 abort: unresolved merge conflicts (see hg help resolve) |
224 [255] |
225 [255] |
225 $ hg resolve -l |
226 $ hg resolve -l |