equal
deleted
inserted
replaced
8 bar -> foo * |
8 bar -> foo * |
9 checking for directory renames |
9 checking for directory renames |
10 foo: versions differ -> m |
10 foo: versions differ -> m |
11 foo: remote copied to bar -> m |
11 foo: remote copied to bar -> m |
12 copying foo to bar |
12 copying foo to bar |
|
13 picked tool 'internal:merge' for foo (binary False symlink False) |
13 merging foo and bar |
14 merging foo and bar |
14 my foo@2092631ce82b+ other bar@7731dad1c2b9 ancestor foo@310fd17130da |
15 my foo@2092631ce82b+ other bar@7731dad1c2b9 ancestor foo@310fd17130da |
|
16 premerge successful |
|
17 picked tool 'internal:merge' for foo (binary False symlink False) |
15 merging foo |
18 merging foo |
16 my foo@2092631ce82b+ other foo@7731dad1c2b9 ancestor foo@310fd17130da |
19 my foo@2092631ce82b+ other foo@7731dad1c2b9 ancestor foo@310fd17130da |
|
20 premerge successful |
17 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
21 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
18 (branch merge, don't forget to commit) |
22 (branch merge, don't forget to commit) |
19 -- foo -- |
23 -- foo -- |
20 line 0 |
24 line 0 |
21 line 1 |
25 line 1 |