|
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 There are unresolved merges, you can redo the full merge using: |
|
13 hg update -C 2 |
|
14 hg merge 1 |
|
15 line 1 |
|
16 line 2 |
|
17 third line |
|
18 M f |
|
19 # merge using internal:local tool |
|
20 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
21 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
22 (branch merge, don't forget to commit) |
|
23 line 1 |
|
24 line 2 |
|
25 third line |
|
26 M f |
|
27 # merge using internal:other tool |
|
28 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
29 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
30 (branch merge, don't forget to commit) |
|
31 first line |
|
32 line 2 |
|
33 line 3 |
|
34 M f |
|
35 # merge using default tool |
|
36 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
37 merging f |
|
38 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
39 (branch merge, don't forget to commit) |
|
40 first line |
|
41 line 2 |
|
42 third line |
|
43 M f |