equal
deleted
inserted
replaced
11 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
11 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
12 merging file1 |
12 merging file1 |
13 warning: conflicts during merge. |
13 warning: conflicts during merge. |
14 merging file1 failed! |
14 merging file1 failed! |
15 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
15 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
16 There are unresolved merges with locally modified files. |
16 use 'hg resolve' to retry unresolved file merges |
17 You can redo the full merge using: |
|
18 hg update 0 |
|
19 hg update 1 |
|
20 diff -r f248da0d4c3e file1 |
17 diff -r f248da0d4c3e file1 |
21 --- a/file1 |
18 --- a/file1 |
22 +++ b/file1 |
19 +++ b/file1 |
23 @@ -1,3 +1,7 @@ |
20 @@ -1,3 +1,7 @@ |
24 added file1 |
21 added file1 |