summaryrefslogtreecommitdiff
path: root/mergetools/diffmerge
AgeCommit message (Expand)AuthorFilesLines
2016-11-29mergetool: honor mergetool.$tool.trustExitCode for built-in toolsLibravatar David Aguilar1-0/+4
2014-11-21mergetools: stop setting $status in merge_cmd()Libravatar David Aguilar1-1/+0
2013-10-13mergetools/diffmerge: support DiffMerge as a git mergetoolLibravatar Stefan Saasen1-0/+15