mergetool: honor mergetool.$tool.trustExitCode for built-in tools
authorDavid Aguilar <davvid@gmail.com>
Tue, 29 Nov 2016 09:38:07 +0000 (01:38 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 29 Nov 2016 18:54:03 +0000 (10:54 -0800)
commit7c10605...2ccf499af6136e993cf248892be39168
treefd2c42e...696c365423d767225278d8cd8c49b516copy hash to clipboard (tree)
parentac84098...7e32406a982ac01cc76a663d5605224bcopy hash to clipboard (diff)
20 files changed:
git-mergetool--lib.sh
mergetools/araxis
mergetools/bc
mergetools/codecompare
mergetools/deltawalker
mergetools/diffmerge
mergetools/diffuse
mergetools/ecmerge
mergetools/emerge
mergetools/examdiff
mergetools/kdiff3
mergetools/kompare
mergetools/meld
mergetools/opendiff
mergetools/p4merge
mergetools/tkdiff
mergetools/tortoisemerge
mergetools/vimdiff
mergetools/winmerge
mergetools/xxdiff