summaryrefslogtreecommitdiffstats
path: root/mergetools/emerge (follow)
AgeCommit message (Expand)AuthorFilesLines
2016-11-29mergetool: honor mergetool.$tool.trustExitCode for built-in toolsDavid Aguilar1-0/+4
2014-11-21mergetools: stop setting $status in merge_cmd()David Aguilar1-1/+0
2011-08-19mergetool--lib: Refactor tools into separate filesDavid Aguilar1-0/+23