##// END OF EJS Templates
tests: avoid writing files to HGTMP
Matt Mackall -
r19264:eac114e1 default
parent child Browse files
Show More
@@ -281,7 +281,7 b' and true.executable set to cat with path'
281
281
282 environment variables in true.executable are handled:
282 environment variables in true.executable are handled:
283
283
284 $ echo 'echo "custom merge tool"' > "$HGTMP/merge.sh"
284 $ echo 'echo "custom merge tool"' > .hg/merge.sh
285 $ beforemerge
285 $ beforemerge
286 [merge-tools]
286 [merge-tools]
287 false.whatever=
287 false.whatever=
@@ -289,7 +289,7 b' environment variables in true.executable'
289 true.executable=cat
289 true.executable=cat
290 # hg update -C 1
290 # hg update -C 1
291 $ hg --config merge-tools.true.executable='sh' \
291 $ hg --config merge-tools.true.executable='sh' \
292 > --config merge-tools.true.args="$HGTMP/merge.sh" \
292 > --config merge-tools.true.args=.hg/merge.sh \
293 > merge -r 2
293 > merge -r 2
294 merging f
294 merging f
295 custom merge tool
295 custom merge tool
General Comments 0
You need to be logged in to leave comments. Login now