summaryrefslogtreecommitdiff
path: root/xdiff
diff options
context:
space:
mode:
authorLibravatar David Aguilar <davvid@gmail.com>2014-10-15 21:45:14 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-10-16 11:58:11 -0700
commitb12d04503b0aba1f2d68b164b348cbf94bbe570b (patch)
tree375ed9642619d3b2715030f90484fffdfc916ca3 /xdiff
parentMerge branch 'maint-2.0' into maint (diff)
downloadtgif-b12d04503b0aba1f2d68b164b348cbf94bbe570b.tar.xz
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>
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions