summaryrefslogtreecommitdiff
path: root/mergetools/vimdiff
AgeCommit message (Expand)Author
2025-06-06doc: update references to renamed AsciiDoc filesJouke Witteveen
2025-04-08Merge branch 'fr/vimdiff-layout-fixes'Junio C Hamano
2025-03-25mergetools: vimdiff: add tests for layout with REMOTE as the targetFernando Ramos
2025-03-25mergetools: vimdiff: fix layout where REMOTE is the targetFernando Ramos
2024-10-03mergetool: fix a typoAndrew Kreimer
2024-05-17Switch grep from non-portable BRE to portable EREMarcel Telka
2024-04-26vimdiff: make script and tests work with zshbrian m. carlson
2024-02-19mergetools: vimdiff: use correct tool's name when reading mergetool configKipras Melnikovas
2022-08-10mergetools: vimdiff: simplify tabfirstFelipe Contreras
2022-08-10mergetools: vimdiff: fix single window layoutsFelipe Contreras
2022-08-10mergetools: vimdiff: rework tab logicFelipe Contreras
2022-08-10mergetools: vimdiff: fix for diffoptFelipe Contreras
2022-08-10mergetools: vimdiff: silence annoying messagesFelipe Contreras
2022-08-10mergetools: vimdiff: make vimdiff3 actually workFelipe Contreras
2022-08-10mergetools: vimdiff: fix commentFelipe Contreras
2022-07-27Merge branch 'fr/vimdiff-layout-fix' into maintJunio C Hamano
2022-07-27Merge branch 'js/vimdiff-quotepath-fix' into maintJunio C Hamano
2022-07-14mergetool(vimdiff): allow paths to contain spaces againJohannes Schindelin
2022-07-08vimdiff: make layout engine more robust against user vim settingsFernando Ramos
2022-04-03vimdiff: add tool documentationFernando Ramos
2022-03-30vimdiff: new implementation with layout supportFernando Ramos
2021-02-23mergetools/vimdiff: add vimdiff1 merge tool variantSeth House
2020-07-29mergetools: add support for nvimdiff (neovim) familypudinha
2020-07-29mergetool--lib: improve support for vimdiff-style tool variantspudinha
2016-11-29mergetools/vimdiff: trust Vim's exit codeDavid Aguilar
2016-11-29mergetool: honor mergetool.$tool.trustExitCode for built-in toolsDavid Aguilar
2016-02-12mergetool: reorder vim/gvim buffers in three-way diffsDickson Wong
2014-04-22mergetools: add vimdiff3 modeFelipe Contreras
2013-01-28mergetools: simplify how we handle "vim" and "defaults"David Aguilar
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-30 11:18:01 +0000