36 branchmerge: True, force: False, partial: False |
36 branchmerge: True, force: False, partial: False |
37 ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104 |
37 ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104 |
38 starting 4 threads for background file closing (?) |
38 starting 4 threads for background file closing (?) |
39 preserving foo for resolve of bar |
39 preserving foo for resolve of bar |
40 preserving foo for resolve of foo |
40 preserving foo for resolve of foo |
41 bar: remote copied from foo -> m (premerge) |
41 bar: remote copied from foo -> m |
42 picked tool ':merge' for bar (binary False symlink False changedelete False) |
42 picked tool ':merge' for bar (binary False symlink False changedelete False) |
43 merging foo and bar to bar |
43 merging foo and bar to bar |
44 my bar@6a0df1dad128+ other bar@484bf6903104 ancestor foo@e6dc8efe11cc |
44 my bar@6a0df1dad128+ other bar@484bf6903104 ancestor foo@e6dc8efe11cc |
45 premerge successful |
45 premerge successful |
46 foo: versions differ -> m (premerge) |
46 foo: versions differ -> m |
47 picked tool ':merge' for foo (binary False symlink False changedelete False) |
47 picked tool ':merge' for foo (binary False symlink False changedelete False) |
48 merging foo |
48 merging foo |
49 my foo@6a0df1dad128+ other foo@484bf6903104 ancestor foo@e6dc8efe11cc |
49 my foo@6a0df1dad128+ other foo@484bf6903104 ancestor foo@e6dc8efe11cc |
50 premerge successful |
50 premerge successful |
51 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
51 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |