Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-up-local-change.out @ 2552:bb403d427974

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Adjusted test output to changed abort message of 'hg merge' (from 0229ff95faec)
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 03 Jul 2006 19:28:31 +0200
parents e506c14382fd
children 30f59f4a327e 9d1c3529ebbc
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'
+abort: there is nothing to merge, just use 'hg update' or look at 'hg heads'
 failed
 changeset:   0:33aaa84a386b
 user:        test