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