equal
deleted
inserted
replaced
127 move:[4] babar count up to fifteen |
127 move:[4] babar count up to fifteen |
128 atop:[5] babar count up to ten |
128 atop:[5] 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 evolve --abort' 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 |
221 merging babar |
221 merging babar |
222 output file babar appears unchanged |
222 output file babar appears unchanged |
223 was merge successful (yn)? n |
223 was merge successful (yn)? n |
224 merging babar failed! |
224 merging babar failed! |
225 evolve failed! |
225 evolve failed! |
226 fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort |
226 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort |
227 abort: unresolved merge conflicts (see hg help resolve) |
227 abort: unresolved merge conflicts (see hg help resolve) |
228 [255] |
228 [255] |
229 $ hg resolve -l |
229 $ hg resolve -l |
230 U babar |
230 U babar |
231 $ hg log -G |
231 $ hg log -G |