Mercurial > hg-stable

diff tests/test-merge9 @ 7847:30cb79d84352

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: keep .orig files
author Matt Mackall <mpm@selenic.com>
date Mon, 16 Mar 2009 16:58:41 -0500
parents 5a14a8f3b909
children 6c82beaaa11a
line wrap: on
line diff
--- a/tests/test-merge9	Mon Mar 09 11:41:38 2009 -0500
+++ b/tests/test-merge9	Mon Mar 16 16:58:41 2009 -0500
@@ -37,6 +37,7 @@
 
 echo % show
 hg resolve -l
+hg st
 
 echo % re-resolve baz
 hg resolve baz