equal
deleted
inserted
replaced
126 $ hg evolve |
126 $ hg evolve |
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 abort: fix conflicts and see `hg help evolve.interrupted` |
132 see `hg help evolve.interrupted` |
|
133 abort: unresolved merge conflicts (see hg help resolve) |
|
134 [255] |
132 [255] |
135 $ hg resolve -l |
133 $ hg resolve -l |
136 U babar |
134 U babar |
137 $ hg log -G |
135 $ hg log -G |
138 @ changeset: 5:e04690b09bc6 |
136 @ changeset: 5:e04690b09bc6 |
220 atop:[7] babar count up to ten |
218 atop:[7] babar count up to ten |
221 merging babar |
219 merging babar |
222 output file babar appears unchanged |
220 output file babar appears unchanged |
223 was merge successful (yn)? n |
221 was merge successful (yn)? n |
224 merging babar failed! |
222 merging babar failed! |
225 evolve failed! |
223 abort: fix conflicts and see `hg help evolve.interrupted` |
226 see `hg help evolve.interrupted` |
|
227 abort: unresolved merge conflicts (see hg help resolve) |
|
228 [255] |
224 [255] |
229 $ hg resolve -l |
225 $ hg resolve -l |
230 U babar |
226 U babar |
231 $ hg log -G |
227 $ hg log -G |
232 @ changeset: 7:b20d08eea373 |
228 @ changeset: 7:b20d08eea373 |