--- a/tests/test-convert-svn-sink Wed Aug 13 20:18:40 2008 -0500
+++ b/tests/test-convert-svn-sink Wed Aug 13 20:18:40 2008 -0500
@@ -128,6 +128,7 @@
hg --cwd b up -C 2
hg --cwd b merge
hg --cwd b revert -r 2 b
+hg resolve -m b
hg --cwd b ci -d '5 0' -m 'merge'
hg convert -d svn b