Mercurial > hg-stable

diff tests/test-merge9 @ 7527:5a14a8f3b909

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: require -a switch to resolve all files Like revert -a, this should make this command slightly safer
author Matt Mackall <mpm@selenic.com>
date Fri, 19 Dec 2008 16:47:36 -0600
parents 92ccccb55ba3
children 30cb79d84352
line wrap: on
line diff
--- a/tests/test-merge9	Fri Dec 19 21:38:01 2008 +0100
+++ b/tests/test-merge9	Fri Dec 19 16:47:36 2008 -0600
@@ -44,8 +44,11 @@
 echo % after
 hg resolve -l
 
+echo % resolve all warning
+hg resolve
+
 echo % resolve all
-hg resolve
+hg resolve -a
 
 echo % after
 hg resolve -l