| commit | b12d04503b0aba1f2d68b164b348cbf94bbe570b | |
| author | David Aguilar <davvid@gmail.com> | |
| Thu, 16 Oct 2014 04:45:14 +0000 (15 21:45 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 16 Oct 2014 18:58:11 +0000 (16 11:58 -0700) | ||
| tree | 375ed9642619d3b2715030f90484fffdfc916ca3 | treesnapshot (tar.gz zip) |
| parent | 3c2dc76f015b4d52ef02a08c59a4546d00b475e1 | commitdiff |
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>
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>
| Documentation/config.txt | diffblobblamehistory | |
| mergetools/meld | diffblobblamehistory |