changeset 8674 | 0941ee76489e |
parent 8539 | 9a4fe59b1eca |
child 8901 | 94319ae527cf |
--- a/tests/test-merge-tools Fri May 29 22:18:16 2009 -0400 +++ b/tests/test-merge-tools Sun May 31 15:20:31 2009 -0400 @@ -60,7 +60,9 @@ echo "# default is internal merge:" beforemerge echo "# hg merge -r 2" -PATH=$BINDIR hg merge -r 2 +# override $PATH to ensure hgmerge not visible; use $PYTHON in case we're +# running from a devel copy, not a temp installation +PATH=$BINDIR $PYTHON $BINDIR/hg merge -r 2 aftermerge echo "# simplest hgrc using false for merge:"