summaryrefslogtreecommitdiffstats
path: root/mergetools/vimdiff
AgeCommit message (Expand)AuthorLines
2025-06-06doc: update references to renamed AsciiDoc filesJouke Witteveen-2/+2
2025-04-08Merge branch 'fr/vimdiff-layout-fixes'Junio C Hamano-1/+13
2025-03-25mergetools: vimdiff: add tests for layout with REMOTE as the targetFernando Ramos-1/+10
2025-03-25mergetools: vimdiff: fix layout where REMOTE is the targetFernando Ramos-0/+3
2024-10-03mergetool: fix a typoAndrew Kreimer-1/+1
2024-05-17Switch grep from non-portable BRE to portable EREMarcel Telka-1/+1
2024-04-26vimdiff: make script and tests work with zshbrian m. carlson-2/+1
2024-02-19mergetools: vimdiff: use correct tool's name when reading mergetool configKipras Melnikovas-2/+10
2022-08-10mergetools: vimdiff: simplify tabfirstFelipe Contreras-25/+19
2022-08-10mergetools: vimdiff: fix single window layoutsFelipe Contreras-12/+8
2022-08-10mergetools: vimdiff: rework tab logicFelipe Contreras-28/+22
2022-08-10mergetools: vimdiff: fix for diffoptFelipe Contreras-18/+18
2022-08-10mergetools: vimdiff: silence annoying messagesFelipe Contreras-2/+2
2022-08-10mergetools: vimdiff: make vimdiff3 actually workFelipe Contreras-18/+18
2022-08-10mergetools: vimdiff: fix commentFelipe Contreras-2/+2
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-03-15 05:09:23 +0000