Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-up-local-change.out @ 3592:fffc8a733bf9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Backed out changeset 41989e55fa375de4376e7e64b17e38312e8ec140
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Tue, 31 Oct 2006 13:02:49 +0100
parents 41989e55fa37
children 17ed9b9a0d03
line wrap: on
line diff
--- a/tests/test-up-local-change.out
+++ b/tests/test-up-local-change.out
@@ -93,7 +93,7 @@ user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     2
 
-abort: outstanding uncommited changes, use 'hg update -C' to lose changes
+abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes
 failed
 abort: outstanding uncommitted changes
 failed