summaryrefslogtreecommitdiff
path: root/mergetools/examdiff
Commit message (Expand)AuthorAgeFilesLines
* mergetool: honor mergetool.$tool.trustExitCode for built-in toolsDavid Aguilar2016-11-291-2/+0
* mergetools: add support for ExamDiffjn/mergetools-examdiffJacob Nisnevich2016-04-041-0/+18