diff options
Diffstat (limited to 'tests/test-merge4.t')
| -rw-r--r-- | tests/test-merge4.t | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/tests/test-merge4.t b/tests/test-merge4.t index d0c27d1..3e6436c 100644 --- a/tests/test-merge4.t +++ b/tests/test-merge4.t @@ -16,10 +16,5 @@ (branch merge, don't forget to commit) $ rm b $ echo This is file c22 > c - -Test hg behaves when committing with a missing file added by a merge - $ hg commit -m "commit #3" - abort: cannot commit merge with missing files - [255] |