equal
deleted
inserted
replaced
175 base: [10] added a d with bar in it, expect some beers |
175 base: [10] added a d with bar in it, expect some beers |
176 merging "other" content-divergent changeset 'b10b07a394f1' |
176 merging "other" content-divergent changeset 'b10b07a394f1' |
177 merging d |
177 merging d |
178 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
178 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
179 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
179 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
180 abort: fix conflicts and see `hg help evolve.interrupted` |
180 fix conflicts and see `hg help evolve.interrupted` |
181 [255] |
181 [1] |
182 |
182 |
183 $ echo foobar > d |
183 $ echo foobar > d |
184 $ hg resolve -m |
184 $ hg resolve -m |
185 (no more unresolved files) |
185 (no more unresolved files) |
186 continue: hg evolve --continue |
186 continue: hg evolve --continue |
235 base: [13] foo to d |
235 base: [13] foo to d |
236 merging "other" content-divergent changeset '27f0463f169a' |
236 merging "other" content-divergent changeset '27f0463f169a' |
237 merging d |
237 merging d |
238 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
238 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
239 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
239 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
240 abort: fix conflicts and see `hg help evolve.interrupted` |
240 fix conflicts and see `hg help evolve.interrupted` |
241 [255] |
241 [1] |
242 |
242 |
243 $ echo watbar > d |
243 $ echo watbar > d |
244 $ hg resolve -m |
244 $ hg resolve -m |
245 (no more unresolved files) |
245 (no more unresolved files) |
246 continue: hg evolve --continue |
246 continue: hg evolve --continue |
532 updating to "local" side of the conflict: b4575ed6fcfc |
532 updating to "local" side of the conflict: b4575ed6fcfc |
533 merging "other" content-divergent changeset '48f745db3f53' |
533 merging "other" content-divergent changeset '48f745db3f53' |
534 merging y |
534 merging y |
535 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') |
535 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') |
536 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
536 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
537 abort: fix conflicts and see `hg help evolve.interrupted` |
537 fix conflicts and see `hg help evolve.interrupted` |
538 [255] |
538 [1] |
539 |
539 |
540 $ echo watbar > y |
540 $ echo watbar > y |
541 $ hg resolve -m |
541 $ hg resolve -m |
542 (no more unresolved files) |
542 (no more unresolved files) |
543 continue: hg evolve --continue |
543 continue: hg evolve --continue |