aboutsummaryrefslogtreecommitdiffstats
path: root/mergetools/defaults (follow)
AgeCommit message (Expand)AuthorFilesLines
2013-01-28mergetools: simplify how we handle "vim" and "defaults"David Aguilar1-22/+0
2012-09-25mergetool--lib: Allow custom commands to override built-insDavid Aguilar1-26/+2
2011-08-19mergetool--lib: Refactor tools into separate filesDavid Aguilar1-0/+46