--- a/tests/test-merge-force	Fri Mar 14 09:56:58 2008 -0300
+++ b/tests/test-merge-force	Fri Mar 14 09:56:58 2008 -0300
@@ -17,7 +17,8 @@
 rm a
 
 echo '% local deleted a file, remote removed'
-hg -v merge
+hg merge # should fail, since there are deleted files
+hg -v merge --force
 echo % should show a as removed
 hg st