diff options
| author | Lorry Tar Creator <lorry-tar-importer@baserock.org> | 2011-10-01 20:49:36 +0000 |
|---|---|---|
| committer | Lorry <lorry@roadtrain.codethink.co.uk> | 2012-09-27 13:27:51 +0000 |
| commit | 921ced43c48c1d170452a7b251b94cc96ec8dd44 (patch) | |
| tree | 3c4a89176ea67fe4c7bf7b375488361a823c95fa /tests/test-merge-force.t | |
| parent | 9039c805b0a7e36220101323f82735f08a104b37 (diff) | |
| download | mercurial-tarball-921ced43c48c1d170452a7b251b94cc96ec8dd44.tar.gz | |
Imported from /srv/lorry/lorry-area/mercurial-tarball/mercurial-1.9.3.tar.gz.HEADmercurial-1.9.3master
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: |