commit | b12d04503b0aba1f2d68b164b348cbf94bbe570b | [log] [tgz] |
---|---|---|
author | David Aguilar <davvid@gmail.com> | Wed Oct 15 21:45:14 2014 -0700 |
committer | Junio C Hamano <gitster@pobox.com> | Thu Oct 16 11:58:11 2014 -0700 |
tree | 375ed9642619d3b2715030f90484fffdfc916ca3 | |
parent | 3c2dc76f015b4d52ef02a08c59a4546d00b475e1 [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 <novoselt@gmail.com> Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>