summaryrefslogtreecommitdiff
path: root/mergetools/kdiff3
AgeCommit message (Expand)AuthorFilesLines
2016-11-29mergetool: honor mergetool.$tool.trustExitCode for built-in toolsLibravatar David Aguilar1-0/+4
2014-11-21mergetools: stop setting $status in merge_cmd()Libravatar David Aguilar1-1/+0
2013-05-09mergetools/kdiff3: do not use --auto when diffingLibravatar David Aguilar1-1/+1
2011-08-19mergetool--lib: Refactor tools into separate filesLibravatar David Aguilar1-0/+24