summaryrefslogtreecommitdiff
path: root/mergetools/vimdiff
AgeCommit message (Expand)AuthorFilesLines
2020-07-29mergetools: add support for nvimdiff (neovim) familyLibravatar pudinha1-6/+9
2020-07-29mergetool--lib: improve support for vimdiff-style tool variantsLibravatar pudinha1-0/+8
2016-11-29mergetools/vimdiff: trust Vim's exit codeLibravatar David Aguilar1-0/+4
2016-11-29mergetool: honor mergetool.$tool.trustExitCode for built-in toolsLibravatar David Aguilar1-2/+0
2016-02-12mergetool: reorder vim/gvim buffers in three-way diffsLibravatar Dickson Wong1-2/+2
2014-04-22mergetools: add vimdiff3 modeLibravatar Felipe Contreras1-2/+12
2013-01-28mergetools: simplify how we handle "vim" and "defaults"Libravatar David Aguilar1-0/+36