equal
deleted
inserted
replaced
46 merging file1 |
46 merging file1 |
47 warning: conflicts during merge. |
47 warning: conflicts during merge. |
48 merging file1 failed! |
48 merging file1 failed! |
49 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
49 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
50 use 'hg resolve' to retry unresolved file merges |
50 use 'hg resolve' to retry unresolved file merges |
|
51 [1] |
51 |
52 |
52 $ hg diff --nodates |
53 $ hg diff --nodates |
53 diff -r dfab7f3c2efb file1 |
54 diff -r dfab7f3c2efb file1 |
54 --- a/file1 |
55 --- a/file1 |
55 +++ b/file1 |
56 +++ b/file1 |