summaryrefslogtreecommitdiff
path: root/mergetools/vimdiff
Commit message (Expand)AuthorAgeFilesLines
* mergetools: vimdiff: simplify tabfirstFelipe Contreras2022-08-101-25/+19
* mergetools: vimdiff: fix single window layoutsFelipe Contreras2022-08-101-12/+8
* mergetools: vimdiff: rework tab logicFelipe Contreras2022-08-101-28/+22
* mergetools: vimdiff: fix for diffoptFelipe Contreras2022-08-101-18/+18
* mergetools: vimdiff: silence annoying messagesFelipe Contreras2022-08-101-2/+2
* mergetools: vimdiff: make vimdiff3 actually workFelipe Contreras2022-08-101-18/+18
* mergetools: vimdiff: fix commentFelipe Contreras2022-08-101-2/+2
* Merge branch 'fr/vimdiff-layout-fix' into maintJunio C Hamano2022-07-271-18/+18
|\
| * vimdiff: make layout engine more robust against user vim settingsFernando Ramos2022-07-081-18/+18
* | Merge branch 'js/vimdiff-quotepath-fix' into maintJunio C Hamano2022-07-271-4/+35
|\ \ | |/ |/|
| * mergetool(vimdiff): allow paths to contain spaces againJohannes Schindelin2022-07-141-4/+35
|/
* vimdiff: add tool documentationFernando Ramos2022-04-031-0/+53
* vimdiff: new implementation with layout supportFernando Ramos2022-03-301-29/+529
* mergetools/vimdiff: add vimdiff1 merge tool variantSeth House2021-02-231-1/+12
* mergetools: add support for nvimdiff (neovim) familypudinha2020-07-291-6/+9
* mergetool--lib: improve support for vimdiff-style tool variantspudinha2020-07-291-0/+8
* mergetools/vimdiff: trust Vim's exit codeda/mergetool-trust-exit-codeDavid Aguilar2016-11-291-0/+4
* mergetool: honor mergetool.$tool.trustExitCode for built-in toolsDavid Aguilar2016-11-291-2/+0
* mergetool: reorder vim/gvim buffers in three-way diffsdw/mergetool-vim-window-shuffleDickson Wong2016-02-121-2/+2
* mergetools: add vimdiff3 modefc/mergetools-vimdiff3Felipe Contreras2014-04-221-2/+12
* mergetools: simplify how we handle "vim" and "defaults"David Aguilar2013-01-281-0/+36
View Lorry Controller Status