summaryrefslogtreecommitdiffstats
path: root/mergetools/kdiff3
AgeCommit message (Expand)AuthorLines
2022-04-03mergetools: add description to all diff/merge toolsFernando Ramos-0/+8
2021-06-08mergetools/kdiff3: make kdiff3 work on Windows tooMichael Schindler-0/+9
2016-11-29mergetool: honor mergetool.$tool.trustExitCode for built-in toolsDavid Aguilar-0/+4
2014-11-21mergetools: stop setting $status in merge_cmd()David Aguilar-1/+0
2013-05-09mergetools/kdiff3: do not use --auto when diffingDavid Aguilar-1/+1
2011-08-19mergetool--lib: Refactor tools into separate filesDavid Aguilar-0/+24