equal
deleted
inserted
replaced
84 move:[4] added d |
84 move:[4] added d |
85 atop:[5] added c |
85 atop:[5] added c |
86 merging d |
86 merging d |
87 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
87 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
88 evolve failed! |
88 evolve failed! |
89 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort |
89 see `hg help evolve.interrupted-evolve` |
90 abort: unresolved merge conflicts (see hg help resolve) |
90 abort: unresolved merge conflicts (see hg help resolve) |
91 [255] |
91 [255] |
92 |
92 |
93 $ hg evolve --abort |
93 $ hg evolve --abort |
94 evolve aborted |
94 evolve aborted |
118 move:[4] added d |
118 move:[4] added d |
119 atop:[5] added c |
119 atop:[5] added c |
120 merging d |
120 merging d |
121 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
121 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
122 evolve failed! |
122 evolve failed! |
123 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort |
123 see `hg help evolve.interrupted-evolve` |
124 abort: unresolved merge conflicts (see hg help resolve) |
124 abort: unresolved merge conflicts (see hg help resolve) |
125 [255] |
125 [255] |
126 $ echo foo > d |
126 $ echo foo > d |
127 $ hg resolve -m |
127 $ hg resolve -m |
128 (no more unresolved files) |
128 (no more unresolved files) |
148 move:[5] added c |
148 move:[5] added c |
149 atop:[8] added b |
149 atop:[8] added b |
150 merging c |
150 merging c |
151 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
151 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
152 evolve failed! |
152 evolve failed! |
153 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort |
153 see `hg help evolve.interrupted-evolve` |
154 abort: unresolved merge conflicts (see hg help resolve) |
154 abort: unresolved merge conflicts (see hg help resolve) |
155 [255] |
155 [255] |
156 |
156 |
157 $ hg glog |
157 $ hg glog |
158 @ 8:0c41ec482070 added b |
158 @ 8:0c41ec482070 added b |
243 move:[6] foo to a |
243 move:[6] foo to a |
244 atop:[7] added a |
244 atop:[7] added a |
245 merging a |
245 merging a |
246 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
246 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
247 evolve failed! |
247 evolve failed! |
248 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort |
248 see `hg help evolve.interrupted-evolve` |
249 abort: unresolved merge conflicts (see hg help resolve) |
249 abort: unresolved merge conflicts (see hg help resolve) |
250 [255] |
250 [255] |
251 |
251 |
252 $ hg glog |
252 $ hg glog |
253 o 9:7f8e8bd9f0b6 added c |
253 o 9:7f8e8bd9f0b6 added c |
309 move:[6] foo to a |
309 move:[6] foo to a |
310 atop:[7] added a |
310 atop:[7] added a |
311 merging a |
311 merging a |
312 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
312 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
313 evolve failed! |
313 evolve failed! |
314 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort |
314 see `hg help evolve.interrupted-evolve` |
315 abort: unresolved merge conflicts (see hg help resolve) |
315 abort: unresolved merge conflicts (see hg help resolve) |
316 [255] |
316 [255] |
317 $ hg glog |
317 $ hg glog |
318 o 9:7f8e8bd9f0b6 added c |
318 o 9:7f8e8bd9f0b6 added c |
319 | () draft |
319 | () draft |
388 move:[6] foo to a |
388 move:[6] foo to a |
389 atop:[7] added a |
389 atop:[7] added a |
390 merging a |
390 merging a |
391 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
391 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
392 evolve failed! |
392 evolve failed! |
393 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort |
393 see `hg help evolve.interrupted-evolve` |
394 abort: unresolved merge conflicts (see hg help resolve) |
394 abort: unresolved merge conflicts (see hg help resolve) |
395 [255] |
395 [255] |
396 |
396 |
397 $ hg glog |
397 $ hg glog |
398 o 12:1c476940790a added d |
398 o 12:1c476940790a added d |
466 move:[3] added c |
466 move:[3] added c |
467 atop:[5] added b |
467 atop:[5] added b |
468 merging c |
468 merging c |
469 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
469 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
470 evolve failed! |
470 evolve failed! |
471 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort |
471 see `hg help evolve.interrupted-evolve` |
472 abort: unresolved merge conflicts (see hg help resolve) |
472 abort: unresolved merge conflicts (see hg help resolve) |
473 [255] |
473 [255] |
474 |
474 |
475 $ hg glog |
475 $ hg glog |
476 @ 5:c1f4718020e3 added b |
476 @ 5:c1f4718020e3 added b |
514 move:[3] added c |
514 move:[3] added c |
515 atop:[5] added b |
515 atop:[5] added b |
516 merging c |
516 merging c |
517 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
517 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
518 evolve failed! |
518 evolve failed! |
519 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort |
519 see `hg help evolve.interrupted-evolve` |
520 abort: unresolved merge conflicts (see hg help resolve) |
520 abort: unresolved merge conflicts (see hg help resolve) |
521 [255] |
521 [255] |
522 |
522 |
523 $ hg evolve --abort |
523 $ hg evolve --abort |
524 evolve aborted |
524 evolve aborted |