diff -r f85338f509e4 -r 3b165c127690 tests/test-merge9.t --- a/tests/test-merge9.t Mon Sep 20 15:50:36 2010 -0500 +++ b/tests/test-merge9.t Mon Sep 20 16:00:15 2010 -0500 @@ -90,5 +90,3 @@ $ hg resolve -l U bar R baz - - $ true