Show More
| 1 | NO CONTENT: modified file chmod 100644 => 100755 |
|
NO CONTENT: modified file chmod 100644 => 100755 |
| @@ -1,43 +1,41 | |||||
| 1 | # initial file contents |
|
1 | # initial file contents | |
| 2 | adding f |
|
2 | adding f | |
| 3 | line 1 |
|
3 | line 1 | |
| 4 | line 2 |
|
4 | line 2 | |
| 5 | line 3 |
|
5 | line 3 | |
| 6 | # branch 1: editing line 1 |
|
6 | # branch 1: editing line 1 | |
| 7 | # branch 2: editing line 3 |
|
7 | # branch 2: editing line 3 | |
| 8 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
8 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 9 | created new head |
|
9 | created new head | |
| 10 | # merge using internal:fail tool |
|
10 | # merge using internal:fail tool | |
| 11 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
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: |
|
12 | use 'hg resolve' to retry unresolved file merges | |
| 13 | hg update -C 2 |
|
|||
| 14 | hg merge 1 |
|
|||
| 15 | line 1 |
|
13 | line 1 | |
| 16 | line 2 |
|
14 | line 2 | |
| 17 | third line |
|
15 | third line | |
| 18 | M f |
|
16 | M f | |
| 19 | # merge using internal:local tool |
|
17 | # merge using internal:local tool | |
| 20 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
18 | 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 |
|
19 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 22 | (branch merge, don't forget to commit) |
|
20 | (branch merge, don't forget to commit) | |
| 23 | line 1 |
|
21 | line 1 | |
| 24 | line 2 |
|
22 | line 2 | |
| 25 | third line |
|
23 | third line | |
| 26 | M f |
|
24 | M f | |
| 27 | # merge using internal:other tool |
|
25 | # merge using internal:other tool | |
| 28 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
26 | 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 |
|
27 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 30 | (branch merge, don't forget to commit) |
|
28 | (branch merge, don't forget to commit) | |
| 31 | first line |
|
29 | first line | |
| 32 | line 2 |
|
30 | line 2 | |
| 33 | line 3 |
|
31 | line 3 | |
| 34 | M f |
|
32 | M f | |
| 35 | # merge using default tool |
|
33 | # merge using default tool | |
| 36 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
34 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 37 | merging f |
|
35 | merging f | |
| 38 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
36 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 39 | (branch merge, don't forget to commit) |
|
37 | (branch merge, don't forget to commit) | |
| 40 | first line |
|
38 | first line | |
| 41 | line 2 |
|
39 | line 2 | |
| 42 | third line |
|
40 | third line | |
| 43 | M f |
|
41 | M f | |
General Comments 0
You need to be logged in to leave comments.
Login now