summaryrefslogtreecommitdiff
path: root/mergetools/kdiff3
AgeCommit message (Expand)Author
2016-11-29mergetool: honor mergetool.$tool.trustExitCode for built-in toolsDavid Aguilar
2014-11-21mergetools: stop setting $status in merge_cmd()David Aguilar
2013-05-09mergetools/kdiff3: do not use --auto when diffingDavid Aguilar
2011-08-19mergetool--lib: Refactor tools into separate filesDavid Aguilar