aboutsummaryrefslogtreecommitdiff
path: root/mergetools/defaults
Commit message (Expand)AuthorAge
* mergetool--lib: Allow custom commands to override built-insDavid Aguilar2012-09-25
* mergetool--lib: Refactor tools into separate filesDavid Aguilar2011-08-19