aboutsummaryrefslogtreecommitdiff
path: root/mergetools/diffmerge
Commit message (Expand)AuthorAge
* mergetool: honor mergetool.$tool.trustExitCode for built-in toolsDavid Aguilar2016-11-29
* mergetools: stop setting $status in merge_cmd()David Aguilar2014-11-21
* mergetools/diffmerge: support DiffMerge as a git mergetoolStefan Saasen2013-10-13