--- a/tests/test-merge9 Mon Mar 09 11:41:38 2009 -0500 +++ b/tests/test-merge9 Mon Mar 16 16:58:41 2009 -0500 @@ -37,6 +37,7 @@ echo % show hg resolve -l +hg st echo % re-resolve baz hg resolve baz