summaryrefslogtreecommitdiff
path: root/mergetools/kdiff3
Commit message (Expand)AuthorAgeFilesLines
* mergetools: add description to all diff/merge toolsFernando Ramos2022-04-031-0/+8
* mergetools/kdiff3: make kdiff3 work on Windows tooMichael Schindler2021-06-081-0/+9
* 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
* mergetools/kdiff3: do not use --auto when diffingDavid Aguilar2013-05-091-1/+1
* mergetool--lib: Refactor tools into separate filesDavid Aguilar2011-08-191-0/+24