Mercurial Mercurial > public > mercurial-scm > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-merge-default
changeset 8387 50b6af595e0c
parent 5242 9cd6578750b9
child 8834 6d36fc70754e 
--- a/tests/test-merge-default	Thu May 14 15:48:47 2009 +0200
+++ b/tests/test-merge-default	Thu May 14 16:03:17 2009 +0200
@@ -31,6 +31,7 @@
 hg commit -mm1
 
 echo % should succeed - 2 heads
+hg merge -S
 hg merge
 hg commit -mm2
mercurial-scm/hg