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 preserving foo for resolve of bar |
38 preserving foo for resolve of bar |
39 preserving foo for resolve of foo |
39 preserving foo for resolve of foo |
40 bar: remote copied from foo -> m |
40 bar: remote copied from foo -> m |
41 updating: bar 1/2 files (50.00%) |
|
42 picked tool 'internal:merge' for bar (binary False symlink False) |
41 picked tool 'internal:merge' for bar (binary False symlink False) |
43 merging foo and bar to bar |
42 merging foo and bar to bar |
44 my bar@6a0df1dad128+ other bar@484bf6903104 ancestor foo@e6dc8efe11cc |
43 my bar@6a0df1dad128+ other bar@484bf6903104 ancestor foo@e6dc8efe11cc |
45 premerge successful |
44 premerge successful |
46 foo: versions differ -> m |
45 foo: versions differ -> m |
47 updating: foo 2/2 files (100.00%) |
|
48 picked tool 'internal:merge' for foo (binary False symlink False) |
46 picked tool 'internal:merge' for foo (binary False symlink False) |
49 merging foo |
47 merging foo |
50 my foo@6a0df1dad128+ other foo@484bf6903104 ancestor foo@e6dc8efe11cc |
48 my foo@6a0df1dad128+ other foo@484bf6903104 ancestor foo@e6dc8efe11cc |
51 premerge successful |
49 premerge successful |
52 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
50 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |