| Age | Commit message (Expand) | Author | Files | Lines |
|---|
| 2025-06-06 | doc: update references to renamed AsciiDoc files | Jouke Witteveen | 1 | -2/+2 |
| 2025-04-08 | Merge branch 'fr/vimdiff-layout-fixes' | Junio C Hamano | 1 | -1/+13 |
| 2025-03-25 | mergetools: vimdiff: add tests for layout with REMOTE as the target | Fernando Ramos | 1 | -1/+10 |
| 2025-03-25 | mergetools: vimdiff: fix layout where REMOTE is the target | Fernando Ramos | 1 | -0/+3 |
| 2024-10-03 | mergetool: fix a typo | Andrew Kreimer | 1 | -1/+1 |
| 2024-05-17 | Switch grep from non-portable BRE to portable ERE | Marcel Telka | 1 | -1/+1 |
| 2024-04-26 | vimdiff: make script and tests work with zsh | brian m. carlson | 1 | -2/+1 |
| 2024-02-19 | mergetools: vimdiff: use correct tool's name when reading mergetool config | Kipras Melnikovas | 1 | -2/+10 |
| 2022-08-10 | mergetools: vimdiff: simplify tabfirst | Felipe Contreras | 1 | -25/+19 |
| 2022-08-10 | mergetools: vimdiff: fix single window layouts | Felipe Contreras | 1 | -12/+8 |
| 2022-08-10 | mergetools: vimdiff: rework tab logic | Felipe Contreras | 1 | -28/+22 |
| 2022-08-10 | mergetools: vimdiff: fix for diffopt | Felipe Contreras | 1 | -18/+18 |
| 2022-08-10 | mergetools: vimdiff: silence annoying messages | Felipe Contreras | 1 | -2/+2 |
| 2022-08-10 | mergetools: vimdiff: make vimdiff3 actually work | Felipe Contreras | 1 | -18/+18 |
| 2022-08-10 | mergetools: vimdiff: fix comment | Felipe Contreras | 1 | -2/+2 |
| 2022-07-27 | Merge branch 'fr/vimdiff-layout-fix' into maint | Junio C Hamano | 1 | -18/+18 |
| 2022-07-27 | Merge branch 'js/vimdiff-quotepath-fix' into maint | Junio C Hamano | 1 | -4/+35 |
| 2022-07-14 | mergetool(vimdiff): allow paths to contain spaces again | Johannes Schindelin | 1 | -4/+35 |
| 2022-07-08 | vimdiff: make layout engine more robust against user vim settings | Fernando Ramos | 1 | -18/+18 |
| 2022-04-03 | vimdiff: add tool documentation | Fernando Ramos | 1 | -0/+53 |
| 2022-03-30 | vimdiff: new implementation with layout support | Fernando Ramos | 1 | -29/+529 |
| 2021-02-23 | mergetools/vimdiff: add vimdiff1 merge tool variant | Seth House | 1 | -1/+12 |
| 2020-07-29 | mergetools: add support for nvimdiff (neovim) family | pudinha | 1 | -6/+9 |
| 2020-07-29 | mergetool--lib: improve support for vimdiff-style tool variants | pudinha | 1 | -0/+8 |
| 2016-11-29 | mergetools/vimdiff: trust Vim's exit code | David Aguilar | 1 | -0/+4 |
| 2016-11-29 | mergetool: honor mergetool.$tool.trustExitCode for built-in tools | David Aguilar | 1 | -2/+0 |
| 2016-02-12 | mergetool: reorder vim/gvim buffers in three-way diffs | Dickson Wong | 1 | -2/+2 |
| 2014-04-22 | mergetools: add vimdiff3 mode | Felipe Contreras | 1 | -2/+12 |
| 2013-01-28 | mergetools: simplify how we handle "vim" and "defaults" | David Aguilar | 1 | -0/+36 |
