Mercurial > hg

diff tests/test-convert-clonebranches @ 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 e495f3f35b2d
children bb5ea66789e3
line wrap: on
line diff
--- a/tests/test-convert-clonebranches	Mon Jun 23 15:03:22 2008 +0200
+++ b/tests/test-convert-clonebranches	Mon Jun 23 15:02:52 2008 +0200
@@ -17,7 +17,7 @@
 echo b > b
 hg ci -qAm addb
 hg up -qC
-hg merge
+hg merge default
 hg ci -qm mergeab
 hg tag -ql mergeab
 cd ..