equal
deleted
inserted
replaced
86 resolving manifests |
86 resolving manifests |
87 branchmerge: True, force: False, partial: False |
87 branchmerge: True, force: False, partial: False |
88 ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24 |
88 ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24 |
89 preserving a for resolve of b |
89 preserving a for resolve of b |
90 preserving rev for resolve of rev |
90 preserving rev for resolve of rev |
91 a: keep -> k |
91 a: remote unchanged -> k |
92 b: remote copied from a -> m |
92 b: remote copied from a -> m |
93 updating: b 1/2 files (50.00%) |
93 updating: b 1/2 files (50.00%) |
94 picked tool 'python ../merge' for b (binary False symlink False) |
94 picked tool 'python ../merge' for b (binary False symlink False) |
95 merging a and b to b |
95 merging a and b to b |
96 my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337 |
96 my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337 |
571 resolving manifests |
571 resolving manifests |
572 branchmerge: True, force: False, partial: False |
572 branchmerge: True, force: False, partial: False |
573 ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24 |
573 ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24 |
574 preserving b for resolve of b |
574 preserving b for resolve of b |
575 preserving rev for resolve of rev |
575 preserving rev for resolve of rev |
576 a: keep -> k |
576 a: remote unchanged -> k |
577 b: both created -> m |
577 b: both created -> m |
578 updating: b 1/2 files (50.00%) |
578 updating: b 1/2 files (50.00%) |
579 picked tool 'python ../merge' for b (binary False symlink False) |
579 picked tool 'python ../merge' for b (binary False symlink False) |
580 merging b |
580 merging b |
581 my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000 |
581 my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000 |