# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1229726856 21600
# Node ID e86eaa71219d0dd211718005b3587bd0883dbfe3
# Parent  a2bf4f77dbec704b1b499d87403b0b9b1f5e91a6
resolve: require -a switch to resolve all files

Like revert -a, this should make this command slightly safer

[ original upstream message ]

diff -r a2bf4f77dbec -r e86eaa71219d tests/test-keyword
--- 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