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-revert2.t | |
| parent | 9039c805b0a7e36220101323f82735f08a104b37 (diff) | |
| download | mercurial-tarball-master.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-revert2.t')
| -rw-r--r-- | tests/test-merge-revert2.t | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/test-merge-revert2.t b/tests/test-merge-revert2.t index 4025e56..9f2fc3a 100644 --- a/tests/test-merge-revert2.t +++ b/tests/test-merge-revert2.t @@ -45,7 +45,7 @@ $ hg update merging file1 warning: conflicts during merge. - merging file1 incomplete! (edit conflicts, then use 'hg resolve --mark') + merging file1 failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges [1] |