tests/test-add

--- a/tests/test-add	Wed Aug 13 20:18:40 2008 -0500
+++ b/tests/test-add	Wed Aug 13 20:18:40 2008 -0500
@@ -32,6 +32,7 @@
 echo % should fail
 hg add a
 hg st
+hg resolve -m a
 hg ci -m merge
 
 echo % issue683