summaryrefslogtreecommitdiff
path: root/mergetools/vimdiff
Commit message (Expand)AuthorAgeFilesLines
* mergetools/vimdiff: trust Vim's exit codeda/mergetool-trust-exit-codeDavid Aguilar2016-11-291-0/+4
* mergetool: honor mergetool.$tool.trustExitCode for built-in toolsDavid Aguilar2016-11-291-2/+0
* mergetool: reorder vim/gvim buffers in three-way diffsdw/mergetool-vim-window-shuffleDickson Wong2016-02-121-2/+2
* mergetools: add vimdiff3 modefc/mergetools-vimdiff3Felipe Contreras2014-04-221-2/+12
* mergetools: simplify how we handle "vim" and "defaults"David Aguilar2013-01-281-0/+36