summaryrefslogtreecommitdiff
path: root/mergetools/emerge
Commit message (Expand)AuthorAgeFilesLines
* mergetool: honor mergetool.$tool.trustExitCode for built-in toolsDavid Aguilar2016-11-291-0/+4
* mergetools: stop setting $status in merge_cmd()da/difftool-mergetool-simplify-reporting-statusDavid Aguilar2014-11-211-1/+0
* mergetool--lib: Refactor tools into separate filesDavid Aguilar2011-08-191-0/+23