equal
deleted
inserted
replaced
27 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
27 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
28 src: 'a' -> dst: 'b' * |
28 src: 'a' -> dst: 'b' * |
29 src: 'a' -> dst: 'c' * |
29 src: 'a' -> dst: 'c' * |
30 checking for directory renames |
30 checking for directory renames |
31 resolving manifests |
31 resolving manifests |
32 overwrite: False, partial: False |
32 branchmerge: True, force: False, partial: False |
33 ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6 |
33 ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6 |
34 a: remote moved to b -> m |
34 a: remote moved to b -> m |
35 preserving a for resolve of b |
35 preserving a for resolve of b |
36 a: remote moved to c -> m |
36 a: remote moved to c -> m |
37 preserving a for resolve of c |
37 preserving a for resolve of c |