equal
deleted
inserted
replaced
81 |
81 |
82 $ hg evolve --content-divergent --no-all |
82 $ hg evolve --content-divergent --no-all |
83 merge:[6] added d |
83 merge:[6] added d |
84 with: [5] added d |
84 with: [5] added d |
85 base: [4] added d |
85 base: [4] added d |
86 merging "other" content-divergent changeset 'e49523854bc8' |
|
87 merging d |
86 merging d |
88 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
87 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
89 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
88 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
90 fix conflicts and see `hg help evolve.interrupted` |
89 fix conflicts and see `hg help evolve.interrupted` |
91 [1] |
90 [1] |
189 |
188 |
190 $ hg evolve --all --content-divergent |
189 $ hg evolve --all --content-divergent |
191 merge:[8] added c |
190 merge:[8] added c |
192 with: [10] added c |
191 with: [10] added c |
193 base: [3] added c |
192 base: [3] added c |
194 updating to "local" side of the conflict: 2ba73e31f264 |
|
195 merging "other" content-divergent changeset '491e10505bae' |
|
196 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
193 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
197 merge:[5] added d |
194 merge:[5] added d |
198 with: [7] added d |
195 with: [7] added d |
199 base: [4] added d |
196 base: [4] added d |
200 updating to "local" side of the conflict: e49523854bc8 |
|
201 merging "other" content-divergent changeset 'f0f1694f123e' |
|
202 merging d |
197 merging d |
203 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
198 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
204 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
199 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
205 fix conflicts and see `hg help evolve.interrupted` |
200 fix conflicts and see `hg help evolve.interrupted` |
206 [1] |
201 [1] |
356 $ hg evolve --content-divergent |
351 $ hg evolve --content-divergent |
357 merge:[7] added d |
352 merge:[7] added d |
358 with: [8] added d |
353 with: [8] added d |
359 base: [4] added d |
354 base: [4] added d |
360 rebasing "other" content-divergent changeset 33e4442acf98 on ca1b80f7960a |
355 rebasing "other" content-divergent changeset 33e4442acf98 on ca1b80f7960a |
361 updating to "local" side of the conflict: e49523854bc8 |
|
362 merging "other" content-divergent changeset 'a663d1567f0b' |
|
363 merging d |
356 merging d |
364 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
357 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
365 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
358 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
366 fix conflicts and see `hg help evolve.interrupted` |
359 fix conflicts and see `hg help evolve.interrupted` |
367 [1] |
360 [1] |
449 |
442 |
450 $ hg evolve --content-divergent --no-all |
443 $ hg evolve --content-divergent --no-all |
451 merge:[6] added d |
444 merge:[6] added d |
452 with: [5] added d |
445 with: [5] added d |
453 base: [4] added d |
446 base: [4] added d |
454 merging "other" content-divergent changeset 'e49523854bc8' |
|
455 merging d |
447 merging d |
456 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
448 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
457 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
449 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
458 fix conflicts and see `hg help evolve.interrupted` |
450 fix conflicts and see `hg help evolve.interrupted` |
459 [1] |
451 [1] |
502 $ hg evolve --content-divergent |
494 $ hg evolve --content-divergent |
503 merge:[5] added d |
495 merge:[5] added d |
504 with: [7] added d |
496 with: [7] added d |
505 base: [4] added d |
497 base: [4] added d |
506 rebasing "other" content-divergent changeset 517d4375cb72 on ca1b80f7960a |
498 rebasing "other" content-divergent changeset 517d4375cb72 on ca1b80f7960a |
507 updating to "local" side of the conflict: e49523854bc8 |
|
508 merging "other" content-divergent changeset '606ad96040fc' |
|
509 merging d |
499 merging d |
510 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
500 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
511 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
501 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
512 fix conflicts and see `hg help evolve.interrupted` |
502 fix conflicts and see `hg help evolve.interrupted` |
513 [1] |
503 [1] |