Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-up-local-change.out @ 2903:013921c753bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with other head by default, not tip. fixes issue 339.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Tue, 15 Aug 2006 11:38:07 -0700
parents 49988d9f0758
children 6dddcba7596a
line wrap: on
line diff
--- a/tests/test-up-local-change.out
+++ b/tests/test-up-local-change.out
@@ -43,7 +43,7 @@ user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     1
 
-abort: there is nothing to merge, just use 'hg update' or look at 'hg heads'
+abort: there is nothing to merge - use "hg update" instead
 failed
 changeset:   0:33aaa84a386b
 user:        test