equal
deleted
inserted
replaced
27 all copies found (* = to merge, ! = divergent): |
27 all copies found (* = to merge, ! = divergent): |
28 c -> a * |
28 c -> a * |
29 b -> a * |
29 b -> a * |
30 checking for directory renames |
30 checking for directory renames |
31 resolving manifests |
31 resolving manifests |
32 overwrite None 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 |
35 a: remote moved to b -> m |
35 a: remote moved to b -> m |
36 preserving a for resolve of b |
36 preserving a for resolve of b |
37 preserving a for resolve of c |
37 preserving a for resolve of c |
38 removing a |
38 removing a |