diff options
Diffstat (limited to 'tests/test-commit-unresolved.t')
| -rw-r--r-- | tests/test-commit-unresolved.t | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/test-commit-unresolved.t b/tests/test-commit-unresolved.t index 70a3300..9a96698 100644 --- a/tests/test-commit-unresolved.t +++ b/tests/test-commit-unresolved.t @@ -29,7 +29,7 @@ Merging a conflict araises $ hg merge merging A warning: conflicts during merge. - merging A incomplete! (edit conflicts, then use 'hg resolve --mark') + merging A failed! 1 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon [1] @@ -45,5 +45,3 @@ Mark the conflict as resolved and commit $ hg resolve -m A $ hg commit -m "Merged" - - $ cd .. |