Mercurial Mercurial > test / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: require -a switch to resolve all files stable
authorMatt Mackall <mpm@selenic.com>
Fri, 19 Dec 2008 16:47:36 -0600
branchstable
changeset 558 e86eaa71219d
parent 556 a2bf4f77dbec
child 559 f6af6e742612
child 563 353fad43ad99
resolve: require -a switch to resolve all files Like revert -a, this should make this command slightly safer [ original upstream message ]
tests/test-keyword file | annotate | diff | comparison | revisions 
--- a/tests/test-keyword	Mon Jun 01 14:11:32 2009 -0500
+++ 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
test