102 ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6 |
102 ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6 |
103 starting 4 threads for background file closing (?) |
103 starting 4 threads for background file closing (?) |
104 preserving a for resolve of b |
104 preserving a for resolve of b |
105 preserving a for resolve of c |
105 preserving a for resolve of c |
106 removing a |
106 removing a |
107 b: remote moved from a -> m (premerge) |
107 b: remote moved from a -> m |
108 picked tool ':merge' for b (binary False symlink False changedelete False) |
108 picked tool ':merge' for b (binary False symlink False changedelete False) |
109 merging a and b to b |
109 merging a and b to b |
110 my b@add3f11052fa+ other b@17c05bb7fcb6 ancestor a@b8bf91eeebbc |
110 my b@add3f11052fa+ other b@17c05bb7fcb6 ancestor a@b8bf91eeebbc |
111 premerge successful |
111 premerge successful |
112 c: remote moved from a -> m (premerge) |
112 c: remote moved from a -> m |
113 picked tool ':merge' for c (binary False symlink False changedelete False) |
113 picked tool ':merge' for c (binary False symlink False changedelete False) |
114 merging a and c to c |
114 merging a and c to c |
115 my c@add3f11052fa+ other c@17c05bb7fcb6 ancestor a@b8bf91eeebbc |
115 my c@add3f11052fa+ other c@17c05bb7fcb6 ancestor a@b8bf91eeebbc |
116 premerge successful |
116 premerge successful |
117 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
117 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |