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