git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3c2dc76)
mergetools/meld: make usage of `--output` configurable and more robust
authorDavid Aguilar <redacted>
Thu, 16 Oct 2014 04:45:14 +0000 (21:45 -0700)
committerJunio C Hamano <redacted>
Thu, 16 Oct 2014 18:58:11 +0000 (11:58 -0700)
commitb12d04503b0aba1f2d68b164b348cbf94bbe570b
tree375ed9642619d3b2715030f90484fffdfc916ca3tree | snapshot
parent3c2dc76f015b4d52ef02a08c59a4546d00b475e1commit | diff
mergetools/meld: make usage of `--output` configurable and more robust

Older versions of meld listed --output in `meld --help`.
Newer versions only mention `meld [OPTIONS...]`.
Improve the checks to catch these newer versions.

Add a `mergetool.meld.hasOutput` configuration to allow
overriding the heuristic.

Reported-by: Andrey Novoseltsev <redacted>
Helped-by: Junio C Hamano <redacted>
Signed-off-by: David Aguilar <redacted>
Signed-off-by: Junio C Hamano <redacted>
Documentation/config.txt diff | blob | history
mergetools/meld diff | blob | history
git clone https://git.99rst.org/PROJECT