equal
deleted
inserted
replaced
135 src: 'a' -> dst: 'b' * |
135 src: 'a' -> dst: 'b' * |
136 checking for directory renames |
136 checking for directory renames |
137 resolving manifests |
137 resolving manifests |
138 branchmerge: True, force: True, partial: False |
138 branchmerge: True, force: True, partial: False |
139 ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6 |
139 ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6 |
140 b: local copied/moved to a -> m |
140 b: local copied/moved from a -> m |
141 preserving b for resolve of b |
141 preserving b for resolve of b |
142 updating: b 1/1 files (100.00%) |
142 updating: b 1/1 files (100.00%) |
143 picked tool 'internal:merge' for b (binary False symlink False) |
143 picked tool 'internal:merge' for b (binary False symlink False) |
144 merging b and a to b |
144 merging b and a to b |
145 my b@ef0ef43d49e7+ other a@5d205f8b35b6 ancestor a@68795b066622 |
145 my b@ef0ef43d49e7+ other a@5d205f8b35b6 ancestor a@68795b066622 |