diff options
Diffstat (limited to 'tests/test-merge-force.t')
| -rw-r--r-- | tests/test-merge-force.t | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/test-merge-force.t b/tests/test-merge-force.t index 7a13f66..748ed59 100644 --- a/tests/test-merge-force.t +++ b/tests/test-merge-force.t @@ -19,8 +19,7 @@ Local deleted a file, remote removed Should fail, since there are deleted files: $ hg merge - abort: outstanding uncommitted changes - (use 'hg status' to list changes) + abort: outstanding uncommitted changes (use 'hg status' to list changes) [255] Should succeed with --force: |