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