tree 375ed9642619d3b2715030f90484fffdfc916ca3
parent 3c2dc76f015b4d52ef02a08c59a4546d00b475e1
author David Aguilar <davvid@gmail.com> 1413434714 -0700
committer Junio C Hamano <gitster@pobox.com> 1413485891 -0700

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>