summaryrefslogtreecommitdiff
path: root/mergetools/ecmerge
AgeCommit message (Expand)Author
2016-11-29mergetool: honor mergetool.$tool.trustExitCode for built-in toolsDavid Aguilar
2011-08-19mergetool--lib: Refactor tools into separate filesDavid Aguilar