16 +another last line |
16 +another last line |
17 M zzz1_merge_ok |
17 M zzz1_merge_ok |
18 M zzz2_merge_bad |
18 M zzz2_merge_bad |
19 # local merge with bad merge tool |
19 # local merge with bad merge tool |
20 merging zzz1_merge_ok |
20 merging zzz1_merge_ok |
21 merging zzz1_merge_ok failed! |
|
22 merging zzz2_merge_bad |
21 merging zzz2_merge_bad |
23 merging zzz2_merge_bad failed! |
22 merging zzz2_merge_bad failed! |
24 3 files updated, 0 files merged, 2 files removed, 2 files unresolved |
23 3 files updated, 1 files merged, 2 files removed, 1 files unresolved |
25 There are unresolved merges with locally modified files. |
24 There are unresolved merges with locally modified files. |
26 You can redo the full merge using: |
25 You can finish the partial merge using: |
27 hg update 0 |
26 hg update 0 |
28 hg update 1 |
27 hg update 1 |
29 2 files updated, 0 files merged, 3 files removed, 0 files unresolved |
28 2 files updated, 0 files merged, 3 files removed, 0 files unresolved |
30 --- a/zzz1_merge_ok |
29 --- a/zzz1_merge_ok |
31 +++ b/zzz1_merge_ok |
30 +++ b/zzz1_merge_ok |
|
31 +new first line |
32 +new last line |
32 +new last line |
33 --- a/zzz2_merge_bad |
33 --- a/zzz2_merge_bad |
34 +++ b/zzz2_merge_bad |
34 +++ b/zzz2_merge_bad |
35 +another last line |
35 +another last line |
36 M zzz1_merge_ok |
36 M zzz1_merge_ok |
37 M zzz2_merge_bad |
37 M zzz2_merge_bad |
|
38 ? zzz2_merge_bad.orig |
38 # local merge with conflicts |
39 # local merge with conflicts |
39 warning: conflicts during merge. |
|
40 merging zzz1_merge_ok |
40 merging zzz1_merge_ok |
41 merging zzz2_merge_bad |
41 merging zzz2_merge_bad |
|
42 warning: conflicts during merge. |
42 merging zzz2_merge_bad failed! |
43 merging zzz2_merge_bad failed! |
43 3 files updated, 1 files merged, 2 files removed, 1 files unresolved |
44 3 files updated, 1 files merged, 2 files removed, 1 files unresolved |
44 There are unresolved merges with locally modified files. |
45 There are unresolved merges with locally modified files. |
45 You can finish the partial merge using: |
46 You can finish the partial merge using: |
46 hg update 0 |
47 hg update 0 |