--- a/tests/test-merge9 Fri Dec 19 21:38:01 2008 +0100
+++ b/tests/test-merge9 Fri Dec 19 16:47:36 2008 -0600
@@ -44,8 +44,11 @@
echo % after
hg resolve -l
+echo % resolve all warning
+hg resolve
+
echo % resolve all
-hg resolve
+hg resolve -a
echo % after
hg resolve -l