Mercurial > hg
diff tests/test-resolve.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 | 9f73bddb9d0b |
| children | b2310903c462 |
line wrap: on
line diff
--- a/tests/test-resolve.out Wed Mar 04 17:02:16 2009 -0600 +++ b/tests/test-resolve.out Wed Mar 04 13:06:16 2009 -0600 @@ -4,5 +4,5 @@ created new head % failing merge 0 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 % resolve -l, should be empty