equal
deleted
inserted
replaced
|
1 resolving manifests |
|
2 overwrite None partial False |
|
3 ancestor 310fd17130da local 2092631ce82b+ remote 7731dad1c2b9 |
|
4 foo: versions differ -> m |
|
5 foo: remote copied to bar -> m |
|
6 copying foo to bar |
|
7 merging foo and bar |
|
8 my foo@2092631ce82b+ other bar@7731dad1c2b9 ancestor foo@310fd17130da |
|
9 merging foo |
|
10 my foo@2092631ce82b+ other foo@7731dad1c2b9 ancestor foo@310fd17130da |
|
11 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
12 (branch merge, don't forget to commit) |
|
13 -- foo -- |
|
14 line 0 |
|
15 line 1 |
|
16 line 2-1 |
|
17 -- bar -- |
|
18 line 0 |
|
19 line 1 |
|
20 line 2-2 |