summaryrefslogtreecommitdiff
path: root/mergetools/araxis
Commit message (Expand)AuthorAgeFilesLines
* mergetool: honor mergetool.$tool.trustExitCode for built-in toolsDavid Aguilar2016-11-291-2/+0
* mergetool--lib: Refactor tools into separate filesDavid Aguilar2011-08-191-0/+20