1 # initial file contents |
|
2 adding f |
|
3 line 1 |
|
4 line 2 |
|
5 line 3 |
|
6 # branch 1: editing line 1 |
|
7 # branch 2: editing line 3 |
|
8 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
9 created new head |
|
10 # merge using internal:fail tool |
|
11 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
12 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
|
13 line 1 |
|
14 line 2 |
|
15 third line |
|
16 M f |
|
17 # merge using internal:local tool |
|
18 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
19 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
20 (branch merge, don't forget to commit) |
|
21 line 1 |
|
22 line 2 |
|
23 third line |
|
24 M f |
|
25 # merge using internal:other tool |
|
26 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
27 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
28 (branch merge, don't forget to commit) |
|
29 first line |
|
30 line 2 |
|
31 line 3 |
|
32 M f |
|
33 # merge using default tool |
|
34 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
35 merging f |
|
36 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
37 (branch merge, don't forget to commit) |
|
38 first line |
|
39 line 2 |
|
40 third line |
|
41 M f |
|