aboutsummaryrefslogtreecommitdiff
path: root/mergetools/vimdiff
Commit message (Expand)AuthorAge
* mergetools/vimdiff: trust Vim's exit codeDavid Aguilar2016-11-29
* mergetool: honor mergetool.$tool.trustExitCode for built-in toolsDavid Aguilar2016-11-29
* mergetool: reorder vim/gvim buffers in three-way diffsDickson Wong2016-02-12
* mergetools: add vimdiff3 modeFelipe Contreras2014-04-22
* mergetools: simplify how we handle "vim" and "defaults"David Aguilar2013-01-28