equal
deleted
inserted
replaced
32 branchmerge: True, force: False, partial: False |
32 branchmerge: True, force: False, partial: False |
33 ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6 |
33 ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6 |
34 preserving a for resolve of b |
34 preserving a for resolve of b |
35 preserving a for resolve of c |
35 preserving a for resolve of c |
36 removing a |
36 removing a |
|
37 starting 4 threads for background file closing (?) |
37 b: remote moved from a -> m (premerge) |
38 b: remote moved from a -> m (premerge) |
38 picked tool ':merge' for b (binary False symlink False changedelete False) |
39 picked tool ':merge' for b (binary False symlink False changedelete False) |
39 merging a and b to b |
40 merging a and b to b |
40 my b@add3f11052fa+ other b@17c05bb7fcb6 ancestor a@b8bf91eeebbc |
41 my b@add3f11052fa+ other b@17c05bb7fcb6 ancestor a@b8bf91eeebbc |
41 premerge successful |
42 premerge successful |