tests/test-merge-tools

--- a/tests/test-merge-tools	Mon Feb 16 17:37:23 2009 -0600
+++ b/tests/test-merge-tools	Tue Feb 10 22:47:38 2009 +0100
@@ -58,7 +58,10 @@
 echo
 
 echo "# default is internal merge:"
-domerge -r 2
+beforemerge
+echo "# hg merge -r 2"
+PATH=$BINDIR hg merge -r 2
+aftermerge
 
 echo "# simplest hgrc using false for merge:"
 echo "false.whatever=" >> .hg/hgrc