Mercurial > public > mercurial-scm > hg

diff tests/test-command-template @ 6723:1fe6f365df2e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: only in-branch merges can be implicit
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Mon, 23 Jun 2008 15:02:52 +0200
parents 9a9b02bcbcf4
children 9c8bbae02e9c
line wrap: on
line diff
--- a/tests/test-command-template	Mon Jun 23 15:03:22 2008 +0200
+++ b/tests/test-command-template	Mon Jun 23 15:02:52 2008 +0200
@@ -23,7 +23,7 @@
 echo other 4 >> d
 hg add d
 hg commit -m 'new head' -d '1500000 0' -u 'person'
-hg merge -q
+hg merge -q foo
 hg commit -m 'merge' -d '1500001 0' -u 'person'
 # second branch starting at nullrev
 hg update null