summaryrefslogtreecommitdiffstats
path: root/mergetools/vimdiff
AgeCommit message (Expand)AuthorLines
2016-11-29mergetools/vimdiff: trust Vim's exit codeDavid Aguilar-0/+4
2016-11-29mergetool: honor mergetool.$tool.trustExitCode for built-in toolsDavid Aguilar-2/+0
2016-02-12mergetool: reorder vim/gvim buffers in three-way diffsDickson Wong-2/+2
2014-04-22mergetools: add vimdiff3 modeFelipe Contreras-2/+12
2013-01-28mergetools: simplify how we handle "vim" and "defaults"David Aguilar-0/+36