Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
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)
authorThomas Arendsen Hein <thomas@intevation.de>
Mon, 03 Jul 2006 19:28:31 +0200
changeset 2552 bb403d427974
parent 2551 764a54eb8c5a
child 2553 5b426676f616
Adjusted test output to changed abort message of 'hg merge' (from 0229ff95faec)
tests/test-up-local-change.out file | annotate | diff | comparison | revisions 
--- a/tests/test-up-local-change.out	Mon Jul 03 10:19:09 2006 -0700
+++ b/tests/test-up-local-change.out	Mon Jul 03 19:28:31 2006 +0200
@@ -43,7 +43,7 @@
 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
Mercurial