equal
deleted
inserted
replaced
35 checking for directory renames |
35 checking for directory renames |
36 resolving manifests |
36 resolving manifests |
37 branchmerge: True, force: False, partial: False |
37 branchmerge: True, force: False, partial: False |
38 ancestor: af1939970a1c, local: 044f8520aeeb+, remote: 85c198ef2f6c |
38 ancestor: af1939970a1c, local: 044f8520aeeb+, remote: 85c198ef2f6c |
39 note: possible conflict - a2 was renamed multiple times to: |
39 note: possible conflict - a2 was renamed multiple times to: |
|
40 b2 |
40 c2 |
41 c2 |
41 b2 |
|
42 preserving a for resolve of b |
42 preserving a for resolve of b |
43 removing a |
43 removing a |
44 b2: remote created -> g |
44 b2: remote created -> g |
45 getting b2 |
45 getting b2 |
46 b: remote moved from a -> m (premerge) |
46 b: remote moved from a -> m (premerge) |