Mercurial > public > mercurial-scm > hg-stable

diff tests/test-double-merge @ 8387:50b6af595e0c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: add -S/--show option to review revisions without merging
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Thu, 14 May 2009 16:03:17 +0200
parents 99a4592ea886
children 6d36fc70754e
line wrap: on
line diff
--- a/tests/test-double-merge	Thu May 14 15:48:47 2009 +0200
+++ b/tests/test-double-merge	Thu May 14 16:03:17 2009 +0200
@@ -20,6 +20,7 @@
 hg ci -m 'change foo' -d "1000000 0"
 
 # we get conflicts that shouldn't be there
+hg merge -S
 hg merge --debug
 
 echo "-- foo --"