summaryrefslogtreecommitdiff
path: root/mergetools/defaults
Commit message (Expand)AuthorAgeFilesLines
* mergetools: simplify how we handle "vim" and "defaults"David Aguilar2013-01-281-22/+0
* mergetool--lib: Allow custom commands to override built-insDavid Aguilar2012-09-251-26/+2
* mergetool--lib: Refactor tools into separate filesDavid Aguilar2011-08-191-0/+46