equal
deleted
inserted
replaced
23 searching for copies back to rev 1 |
23 searching for copies back to rev 1 |
24 unmatched files in other: |
24 unmatched files in other: |
25 b |
25 b |
26 c |
26 c |
27 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
27 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
28 c -> a * |
28 src: 'a' -> dst: 'c' * |
29 b -> a * |
29 src: 'a' -> dst: 'b' * |
30 checking for directory renames |
30 checking for directory renames |
31 resolving manifests |
31 resolving manifests |
32 overwrite: False, partial: False |
32 overwrite: False, partial: False |
33 ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6 |
33 ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6 |
34 a: remote moved to c -> m |
34 a: remote moved to c -> m |