equal
deleted
inserted
replaced
33 b -> a * |
33 b -> a * |
34 b2 -> a2 ! |
34 b2 -> a2 ! |
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 None partial False |
38 overwrite: False, partial: False |
39 ancestor af1939970a1c local 044f8520aeeb+ remote 85c198ef2f6c |
39 ancestor: af1939970a1c, local: 044f8520aeeb+, remote: 85c198ef2f6c |
40 a: remote moved to b -> m |
40 a: remote moved to b -> m |
41 b2: remote created -> g |
41 b2: remote created -> g |
42 preserving a for resolve of b |
42 preserving a for resolve of b |
43 removing a |
43 removing a |
44 updating: a 1/3 files (33.33%) |
44 updating: a 1/3 files (33.33%) |