Mercurial > hg-stable
changeset 7859:e945e012d5d1
Fix for merge changes introduced in rev 9fe7e6acf525
| author | Lee Cantey <lcantey@gmail.com> |
|---|---|
| date | Thu, 19 Mar 2009 10:25:13 -0700 |
| parents | d24b367efab9 |
| children | b2c18c795622 |
| files | tests/test-merge-tools.out |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-merge-tools.out Wed Mar 18 17:49:48 2009 +0100 +++ b/tests/test-merge-tools.out Thu Mar 19 10:25:13 2009 -0700 @@ -244,7 +244,7 @@ merging f merging f failed! 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 # cat f revision 1 space @@ -260,7 +260,7 @@ # hg update -C 1 # hg merge -r 2 --config ui.merge=internal:fail 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 # cat f revision 1 space @@ -307,7 +307,7 @@ merging f merging f failed! 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 # cat f revision 1 space