Mercurial > hg
diff tests/test-convert-svn-sink.out @ 7821:9fe7e6acf525
merge: better error messages to lead users to hg update --clean to abandon merges.
Fixes issue1533.
author | Augie Fackler <durin42@gmail.com> |
---|---|
date | Wed, 04 Mar 2009 13:06:16 -0600 |
parents | 92ccccb55ba3 |
children | 99e5f97c9a97 |
line wrap: on
line diff
--- a/tests/test-convert-svn-sink.out Wed Mar 04 17:02:16 2009 -0600 +++ b/tests/test-convert-svn-sink.out Wed Mar 04 13:06:16 2009 -0600 @@ -265,7 +265,7 @@ warning: conflicts during merge. merging b failed! 2 files updated, 0 files merged, 0 files removed, 1 files unresolved -use 'hg resolve' to retry unresolved file merges +use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon assuming destination b-hg initializing svn repo 'b-hg' initializing svn wc 'b-hg-wc'