--- a/tests/test-merge-tools.t Sun Jun 02 14:04:55 2013 -0500
+++ b/tests/test-merge-tools.t Sun Jun 02 15:27:08 2013 -0500
@@ -281,7 +281,7 @@
environment variables in true.executable are handled:
- $ echo 'echo "custom merge tool"' > "$HGTMP/merge.sh"
+ $ echo 'echo "custom merge tool"' > .hg/merge.sh
$ beforemerge
[merge-tools]
false.whatever=
@@ -289,7 +289,7 @@
true.executable=cat
# hg update -C 1
$ hg --config merge-tools.true.executable='sh' \
- > --config merge-tools.true.args="$HGTMP/merge.sh" \
+ > --config merge-tools.true.args=.hg/merge.sh \
> merge -r 2
merging f
custom merge tool