equal
deleted
inserted
replaced
38 branchmerge: True, force: False, partial: False |
38 branchmerge: True, force: False, partial: False |
39 ancestor: af1939970a1c, local: 044f8520aeeb+, remote: 85c198ef2f6c |
39 ancestor: af1939970a1c, local: 044f8520aeeb+, remote: 85c198ef2f6c |
40 note: possible conflict - a2 was renamed multiple times to: |
40 note: possible conflict - a2 was renamed multiple times to: |
41 b2 |
41 b2 |
42 c2 |
42 c2 |
|
43 b2: remote created -> g |
|
44 getting b2 |
43 preserving a for resolve of b |
45 preserving a for resolve of b |
44 removing a |
46 removing a |
45 b2: remote created -> g |
|
46 getting b2 |
|
47 b: remote moved from a -> m (premerge) |
47 b: remote moved from a -> m (premerge) |
48 picked tool ':merge' for b (binary False symlink False changedelete False) |
48 picked tool ':merge' for b (binary False symlink False changedelete False) |
49 merging a and b to b |
49 merging a and b to b |
50 my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c |
50 my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c |
51 premerge successful |
51 premerge successful |