summaryrefslogtreecommitdiff
path: root/mergetools/diffmerge
AgeCommit message (Expand)Author
2016-11-29mergetool: honor mergetool.$tool.trustExitCode for built-in toolsDavid Aguilar
2014-11-21mergetools: stop setting $status in merge_cmd()David Aguilar
2013-10-13mergetools/diffmerge: support DiffMerge as a git mergetoolStefan Saasen