summaryrefslogtreecommitdiffstats
path: root/mergetools/vimdiff
AgeCommit message (Expand)AuthorLines
2022-07-27Merge branch 'fr/vimdiff-layout-fix' into maintJunio C Hamano-18/+18
2022-07-27Merge branch 'js/vimdiff-quotepath-fix' into maintJunio C Hamano-4/+35
2022-07-14mergetool(vimdiff): allow paths to contain spaces againJohannes Schindelin-4/+35
2022-07-08vimdiff: make layout engine more robust against user vim settingsFernando Ramos-18/+18
2022-04-03vimdiff: add tool documentationFernando Ramos-0/+53
2022-03-30vimdiff: new implementation with layout supportFernando Ramos-29/+529
2021-02-23mergetools/vimdiff: add vimdiff1 merge tool variantSeth House-1/+12
2020-07-29mergetools: add support for nvimdiff (neovim) familypudinha-6/+9
2020-07-29mergetool--lib: improve support for vimdiff-style tool variantspudinha-0/+8
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
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-30 14:18:39 +0000