summaryrefslogtreecommitdiffstats
path: root/mergetools/defaults
AgeCommit message (Expand)AuthorLines
2012-09-25mergetool--lib: Allow custom commands to override built-insDavid Aguilar-26/+2
2011-08-19mergetool--lib: Refactor tools into separate filesDavid Aguilar-0/+46