--- a/tests/test-merge9.out	Fri Dec 19 21:38:01 2008 +0100
+++ b/tests/test-merge9.out	Fri Dec 19 16:47:36 2008 -0600
@@ -28,6 +28,8 @@
 % after
 U bar
 R baz
+% resolve all warning
+abort: no files or directories specified; use --all to remerge all files
 % resolve all
 merging bar
 warning: conflicts during merge.