diff options
Diffstat (limited to 'tests/test-merge-default.t')
| -rw-r--r-- | tests/test-merge-default.t | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/test-merge-default.t b/tests/test-merge-default.t index 64f64d3..dac2b4a 100644 --- a/tests/test-merge-default.t +++ b/tests/test-merge-default.t @@ -66,7 +66,7 @@ Should succeed - 2 heads: Should fail because at tip: $ hg merge - abort: nothing to merge + abort: there is nothing to merge [255] $ hg up 0 @@ -75,8 +75,7 @@ Should fail because at tip: Should fail because there is only one head: $ hg merge - abort: nothing to merge - (use 'hg update' instead) + abort: there is nothing to merge - use "hg update" instead [255] $ hg up 3 @@ -85,7 +84,6 @@ Should fail because there is only one head: $ echo f >> a $ hg branch foobranch marked working directory as branch foobranch - (branches are permanent and global, did you want a bookmark?) $ hg commit -mf Should fail because merge with other branch: |