640 base: [5] c_E |
640 base: [5] c_E |
641 rebasing "other" content-divergent changeset b4a584aea4bd on eb1b4e1205b8 |
641 rebasing "other" content-divergent changeset b4a584aea4bd on eb1b4e1205b8 |
642 updating to "local" side of the conflict: c7d2d47c7240 |
642 updating to "local" side of the conflict: c7d2d47c7240 |
643 merging "other" content-divergent changeset '0773642cfa95' |
643 merging "other" content-divergent changeset '0773642cfa95' |
644 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
644 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
645 content divergence resolution between c7d2d47c7240 (public) and 0773642cfa95 has same content as c7d2d47c7240, discarding 0773642cfa95 |
645 1 new orphan changesets |
646 1 new orphan changesets |
646 merge:[8] c_F |
647 merge:[8] c_F |
647 with: [10] c_F |
648 with: [10] c_F |
648 base: [6] c_F |
649 base: [6] c_F |
649 rebasing "other" content-divergent changeset 8ae8db670b4a on c7d2d47c7240 |
650 rebasing "other" content-divergent changeset 8ae8db670b4a on c7d2d47c7240 |
650 updating to "local" side of the conflict: a52ac76b45f5 |
651 updating to "local" side of the conflict: a52ac76b45f5 |
651 merging "other" content-divergent changeset '6a87ed4aa317' |
652 merging "other" content-divergent changeset '6a87ed4aa317' |
652 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
653 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
654 content divergence resolution between a52ac76b45f5 (public) and 6a87ed4aa317 has same content as a52ac76b45f5, discarding 6a87ed4aa317 |
653 $ hg sum |
655 $ hg sum |
654 parent: 8:a52ac76b45f5 tip |
656 parent: 8:a52ac76b45f5 tip |
655 c_F |
657 c_F |
656 branch: default |
658 branch: default |
657 commit: (clean) |
659 commit: (clean) |