# HG changeset patch # User Matt Mackall # Date 2013-06-02 20:27:08 # Node ID eac114e13b967c61dd491c038049bf0c051a799a # Parent 062c0a0a5549840ee8d32b798145262f8e743efb tests: avoid writing files to HGTMP diff --git a/tests/test-merge-tools.t b/tests/test-merge-tools.t --- a/tests/test-merge-tools.t +++ b/tests/test-merge-tools.t @@ -281,7 +281,7 @@ and true.executable set to cat with path 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 @@ environment variables in true.executable 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