changeset 3580 | 41989e55fa37 |
parent 3400 | d2b55e3c4e25 |
child 3592 | fffc8a733bf9 |
--- a/tests/test-up-local-change.out Sun Oct 29 10:55:38 2006 +0100 +++ b/tests/test-up-local-change.out Sun Oct 29 13:08:10 2006 +0100 @@ -93,7 +93,7 @@ date: Mon Jan 12 13:46:40 1970 +0000 summary: 2 -abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes +abort: outstanding uncommited changes, use 'hg update -C' to lose changes failed abort: outstanding uncommitted changes failed