equal
deleted
inserted
replaced
30 1a |
30 1a |
31 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
31 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
32 src: '1' -> dst: '1a' |
32 src: '1' -> dst: '1a' |
33 checking for directory renames |
33 checking for directory renames |
34 resolving manifests |
34 resolving manifests |
35 overwrite: False, partial: False |
35 branchmerge: True, force: False, partial: False |
36 ancestor: 81f4b099af3d, local: c64f439569a9+, remote: c12dcd37c90a |
36 ancestor: 81f4b099af3d, local: c64f439569a9+, remote: c12dcd37c90a |
37 1: other deleted -> r |
37 1: other deleted -> r |
38 1a: remote created -> g |
38 1a: remote created -> g |
39 updating: 1 1/2 files (50.00%) |
39 updating: 1 1/2 files (50.00%) |
40 removing 1 |
40 removing 1 |
61 1a |
61 1a |
62 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
62 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
63 src: '1' -> dst: '1a' * |
63 src: '1' -> dst: '1a' * |
64 checking for directory renames |
64 checking for directory renames |
65 resolving manifests |
65 resolving manifests |
66 overwrite: False, partial: False |
66 branchmerge: True, force: False, partial: False |
67 ancestor: c64f439569a9, local: e327dca35ac8+, remote: 746e9549ea96 |
67 ancestor: c64f439569a9, local: e327dca35ac8+, remote: 746e9549ea96 |
68 1a: local copied/moved to 1 -> m |
68 1a: local copied/moved to 1 -> m |
69 preserving 1a for resolve of 1a |
69 preserving 1a for resolve of 1a |
70 updating: 1a 1/1 files (100.00%) |
70 updating: 1a 1/1 files (100.00%) |
71 picked tool 'internal:merge' for 1a (binary False symlink False) |
71 picked tool 'internal:merge' for 1a (binary False symlink False) |
84 1a |
84 1a |
85 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
85 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
86 src: '1' -> dst: '1a' * |
86 src: '1' -> dst: '1a' * |
87 checking for directory renames |
87 checking for directory renames |
88 resolving manifests |
88 resolving manifests |
89 overwrite: False, partial: False |
89 branchmerge: True, force: False, partial: False |
90 ancestor: c64f439569a9, local: 746e9549ea96+, remote: e327dca35ac8 |
90 ancestor: c64f439569a9, local: 746e9549ea96+, remote: e327dca35ac8 |
91 1: remote moved to 1a -> m |
91 1: remote moved to 1a -> m |
92 preserving 1 for resolve of 1a |
92 preserving 1 for resolve of 1a |
93 removing 1 |
93 removing 1 |
94 updating: 1 1/1 files (100.00%) |
94 updating: 1 1/1 files (100.00%) |