summaryrefslogtreecommitdiff
path: root/mergetools/deltawalker
Commit message (Expand)AuthorAgeFilesLines
* mergetool: honor mergetool.$tool.trustExitCode for built-in toolsDavid Aguilar2016-11-291-1/+5
* mergetools: add a plug-in to support DeltaWalkerTim Henigan2012-03-051-0/+21