Mercurial > hg

diff tests/test-merge-default @ 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 9cd6578750b9
children 6d36fc70754e
line wrap: on
line diff
--- 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