aboutsummaryrefslogtreecommitdiffstats
path: root/mergetools/vimdiff
AgeCommit message (Expand)AuthorFilesLines
13 daysSwitch grep from non-portable BRE to portable EREMarcel Telka1-1/+1
2024-04-26vimdiff: make script and tests work with zshbrian m. carlson1-2/+1
2024-02-19mergetools: vimdiff: use correct tool's name when reading mergetool configKipras Melnikovas1-2/+10
2022-08-10mergetools: vimdiff: simplify tabfirstFelipe Contreras1-25/+19
2022-08-10mergetools: vimdiff: fix single window layoutsFelipe Contreras1-12/+8
2022-08-10mergetools: vimdiff: rework tab logicFelipe Contreras1-28/+22
2022-08-10mergetools: vimdiff: fix for diffoptFelipe Contreras1-18/+18
2022-08-10mergetools: vimdiff: silence annoying messagesFelipe Contreras1-2/+2
2022-08-10mergetools: vimdiff: make vimdiff3 actually workFelipe Contreras1-18/+18
2022-08-10mergetools: vimdiff: fix commentFelipe Contreras1-2/+2
2022-07-27Merge branch 'fr/vimdiff-layout-fix' into maintJunio C Hamano1-18/+18
2022-07-27Merge branch 'js/vimdiff-quotepath-fix' into maintJunio C Hamano1-4/+35
2022-07-14mergetool(vimdiff): allow paths to contain spaces againJohannes Schindelin1-4/+35
2022-07-08vimdiff: make layout engine more robust against user vim settingsFernando Ramos1-18/+18
2022-04-03vimdiff: add tool documentationFernando Ramos1-0/+53
2022-03-30vimdiff: new implementation with layout supportFernando Ramos1-29/+529
2021-02-23mergetools/vimdiff: add vimdiff1 merge tool variantSeth House1-1/+12
2020-07-29mergetools: add support for nvimdiff (neovim) familypudinha1-6/+9
2020-07-29mergetool--lib: improve support for vimdiff-style tool variantspudinha1-0/+8
2016-11-29mergetools/vimdiff: trust Vim's exit codeDavid Aguilar1-0/+4
2016-11-29mergetool: honor mergetool.$tool.trustExitCode for built-in toolsDavid Aguilar1-2/+0
2016-02-12mergetool: reorder vim/gvim buffers in three-way diffsDickson Wong1-2/+2
2014-04-22mergetools: add vimdiff3 modeFelipe Contreras1-2/+12
2013-01-28mergetools: simplify how we handle "vim" and "defaults"David Aguilar1-0/+36
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-30 23:04:05 +0000