equal
deleted
inserted
replaced
8 all copies found (* = to merge, ! = divergent): |
8 all copies found (* = to merge, ! = divergent): |
9 bar -> foo * |
9 bar -> foo * |
10 checking for directory renames |
10 checking for directory renames |
11 foo: versions differ -> m |
11 foo: versions differ -> m |
12 foo: remote copied to bar -> m |
12 foo: remote copied to bar -> m |
13 copying foo to bar |
13 preserving foo for resolve of bar |
14 picked tool 'internal:merge' for foo (binary False symlink False) |
14 preserving foo for resolve of foo |
15 merging foo and bar |
15 picked tool 'internal:merge' for bar (binary False symlink False) |
16 my foo@2092631ce82b+ other bar@7731dad1c2b9 ancestor foo@310fd17130da |
16 merging foo and bar to bar |
|
17 my bar@2092631ce82b+ other bar@7731dad1c2b9 ancestor foo@310fd17130da |
17 premerge successful |
18 premerge successful |
18 picked tool 'internal:merge' for foo (binary False symlink False) |
19 picked tool 'internal:merge' for foo (binary False symlink False) |
19 merging foo |
20 merging foo |
20 my foo@2092631ce82b+ other foo@7731dad1c2b9 ancestor foo@310fd17130da |
21 my foo@2092631ce82b+ other foo@7731dad1c2b9 ancestor foo@310fd17130da |
21 premerge successful |
22 premerge successful |