diff options
Diffstat (limited to 'tests/test-merge-revert2.t')
| -rw-r--r-- | tests/test-merge-revert2.t | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/test-merge-revert2.t b/tests/test-merge-revert2.t index 4025e56..9f2fc3a 100644 --- a/tests/test-merge-revert2.t +++ b/tests/test-merge-revert2.t @@ -45,7 +45,7 @@ $ hg update merging file1 warning: conflicts during merge. - merging file1 incomplete! (edit conflicts, then use 'hg resolve --mark') + merging file1 failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges [1] |