equal
deleted
inserted
replaced
27 c2 |
27 c2 |
28 unmatched files in other: |
28 unmatched files in other: |
29 b |
29 b |
30 b2 |
30 b2 |
31 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
31 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
32 src: 'a2' -> dst: 'c2' ! |
|
33 src: 'a' -> dst: 'b' * |
32 src: 'a' -> dst: 'b' * |
34 src: 'a2' -> dst: 'b2' ! |
33 src: 'a2' -> dst: 'b2' ! |
|
34 src: 'a2' -> dst: 'c2' ! |
35 checking for directory renames |
35 checking for directory renames |
36 a2: divergent renames -> dr |
36 a2: divergent renames -> dr |
37 resolving manifests |
37 resolving manifests |
38 overwrite: False, partial: False |
38 overwrite: False, partial: False |
39 ancestor: af1939970a1c, local: 044f8520aeeb+, remote: 85c198ef2f6c |
39 ancestor: af1939970a1c, local: 044f8520aeeb+, remote: 85c198ef2f6c |