aboutsummaryrefslogtreecommitdiff
path: root/mergetools/kdiff3
Commit message (Expand)AuthorAge
* mergetool: honor mergetool.$tool.trustExitCode for built-in toolsDavid Aguilar2016-11-29
* mergetools: stop setting $status in merge_cmd()David Aguilar2014-11-21
* mergetools/kdiff3: do not use --auto when diffingDavid Aguilar2013-05-09
* mergetool--lib: Refactor tools into separate filesDavid Aguilar2011-08-19