aboutsummaryrefslogtreecommitdiffstats
path: root/mergetools/diffmerge
AgeCommit message (Expand)AuthorFilesLines
2022-04-03mergetools: add description to all diff/merge toolsFernando Ramos1-0/+8
2016-11-29mergetool: honor mergetool.$tool.trustExitCode for built-in toolsDavid Aguilar1-0/+4
2014-11-21mergetools: stop setting $status in merge_cmd()David Aguilar1-1/+0
2013-10-13mergetools/diffmerge: support DiffMerge as a git mergetoolStefan Saasen1-0/+15