summaryrefslogtreecommitdiff
path: root/mergetools/kdiff3
Commit message (Expand)AuthorAgeFilesLines
* 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