equal
deleted
inserted
replaced
38 ancestor: af1939970a1c, local: 044f8520aeeb+, remote: 85c198ef2f6c |
38 ancestor: af1939970a1c, local: 044f8520aeeb+, remote: 85c198ef2f6c |
39 preserving a for resolve of b |
39 preserving a for resolve of b |
40 removing a |
40 removing a |
41 b2: remote created -> g |
41 b2: remote created -> g |
42 getting b2 |
42 getting b2 |
43 updating: b2 1/2 files (50.00%) |
|
44 b: remote moved from a -> m |
43 b: remote moved from a -> m |
45 updating: b 2/2 files (100.00%) |
|
46 picked tool 'internal:merge' for b (binary False symlink False) |
44 picked tool 'internal:merge' for b (binary False symlink False) |
47 merging a and b to b |
45 merging a and b to b |
48 my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c |
46 my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c |
49 premerge successful |
47 premerge successful |
50 note: possible conflict - a2 was renamed multiple times to: |
48 note: possible conflict - a2 was renamed multiple times to: |
179 resolving manifests |
177 resolving manifests |
180 branchmerge: True, force: False, partial: False |
178 branchmerge: True, force: False, partial: False |
181 ancestor: 19d7f95df299, local: 0084274f6b67+, remote: 5d32493049f0 |
179 ancestor: 19d7f95df299, local: 0084274f6b67+, remote: 5d32493049f0 |
182 newfile: remote created -> g |
180 newfile: remote created -> g |
183 getting newfile |
181 getting newfile |
184 updating: newfile 1/1 files (100.00%) |
|
185 note: possible conflict - file was deleted and renamed to: |
182 note: possible conflict - file was deleted and renamed to: |
186 newfile |
183 newfile |
187 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
184 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
188 (branch merge, don't forget to commit) |
185 (branch merge, don't forget to commit) |
189 $ hg status |
186 $ hg status |