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