summaryrefslogtreecommitdiff
path: root/mergetools/defaults
AgeCommit message (Expand)AuthorFilesLines
2012-09-25mergetool--lib: Allow custom commands to override built-insLibravatar David Aguilar1-26/+2
2011-08-19mergetool--lib: Refactor tools into separate filesLibravatar David Aguilar1-0/+46