summaryrefslogtreecommitdiff
path: root/mergetools/diffmerge
Commit message (Expand)AuthorAgeFilesLines
* mergetool: honor mergetool.$tool.trustExitCode for built-in toolsDavid Aguilar2016-11-291-0/+4
* mergetools: stop setting $status in merge_cmd()da/difftool-mergetool-simplify-reporting-statusDavid Aguilar2014-11-211-1/+0
* mergetools/diffmerge: support DiffMerge as a git mergetoolStefan Saasen2013-10-131-0/+15