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