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