Mercurial > public > mercurial-scm > hg

diff tests/test-keyword @ 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 e981725da3fe
children 6c82beaaa11a
line wrap: on
line diff
--- a/tests/test-keyword	Fri Dec 19 21:38:01 2008 +0100
+++ b/tests/test-keyword	Fri Dec 19 16:47:36 2008 -0600
@@ -322,7 +322,7 @@
 echo % keyword stays outside conflict zone
 cat m
 echo % resolve to local
-HGMERGE=internal:local hg resolve
+HGMERGE=internal:local hg resolve -a
 hg commit -m localresolve
 cat m