diff -r 05cf88057fc5 -r f6af6e742612 tests/test-keyword
--- a/tests/test-keyword	Thu Jun 04 09:16:22 2009 +0200
+++ b/tests/test-keyword	Sun Jun 07 01:31:03 2009 +0200
@@ -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