Mercurial > hg
diff tests/test-up-local-change.out @ 3580:41989e55fa37
allow update to switch to a different branch if the repo is clean
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Sun, 29 Oct 2006 13:08:10 +0100 |
parents | d2b55e3c4e25 |
children | fffc8a733bf9 |
line wrap: on
line diff
--- 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