10 all copies found (* = to merge, ! = divergent): |
10 all copies found (* = to merge, ! = divergent): |
11 bar -> foo * |
11 bar -> foo * |
12 checking for directory renames |
12 checking for directory renames |
13 resolving manifests |
13 resolving manifests |
14 overwrite None partial False |
14 overwrite None partial False |
15 ancestor 310fd17130da local 2092631ce82b+ remote 7731dad1c2b9 |
15 ancestor 310fd17130da local 2092631ce82b+ remote d9da848d0adf |
16 foo: versions differ -> m |
16 foo: versions differ -> m |
17 foo: remote copied to bar -> m |
17 foo: remote copied to bar -> m |
18 preserving foo for resolve of bar |
18 preserving foo for resolve of bar |
19 preserving foo for resolve of foo |
19 preserving foo for resolve of foo |
20 update: foo 1/2 files (50.00%) |
20 update: foo 1/2 files (50.00%) |
21 picked tool 'internal:merge' for bar (binary False symlink False) |
21 picked tool 'internal:merge' for bar (binary False symlink False) |
22 merging foo and bar to bar |
22 merging foo and bar to bar |
23 my bar@2092631ce82b+ other bar@7731dad1c2b9 ancestor foo@310fd17130da |
23 my bar@2092631ce82b+ other bar@d9da848d0adf ancestor foo@310fd17130da |
24 premerge successful |
24 premerge successful |
25 update: foo 2/2 files (100.00%) |
25 update: foo 2/2 files (100.00%) |
26 picked tool 'internal:merge' for foo (binary False symlink False) |
26 picked tool 'internal:merge' for foo (binary False symlink False) |
27 merging foo |
27 merging foo |
28 my foo@2092631ce82b+ other foo@7731dad1c2b9 ancestor foo@310fd17130da |
28 my foo@2092631ce82b+ other foo@d9da848d0adf ancestor foo@310fd17130da |
29 premerge successful |
29 premerge successful |
30 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
30 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
31 (branch merge, don't forget to commit) |
31 (branch merge, don't forget to commit) |
32 -- foo -- |
32 -- foo -- |
33 line 0 |
33 line 0 |