Mercurial > hg
diff tests/test-add.out @ 9468:b2310903c462
hg: say 'hg update' instead of 'hg up' in merge status message
Includes the change to the message itself, along with several test
output files that also had to change.
| author | Stuart W Marks <smarks@smarks.org> |
|---|---|
| date | Thu, 17 Sep 2009 22:39:38 -0700 |
| parents | b9a8b616521d |
| children |
line wrap: on
line diff
--- a/tests/test-add.out Sat Sep 19 01:15:38 2009 +0200 +++ b/tests/test-add.out Thu Sep 17 22:39:38 2009 -0700 @@ -20,7 +20,7 @@ warning: conflicts during merge. merging a failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved -use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon +use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon M a ? a.orig % should fail