Age | Commit message (Expand) | Author | Files | Lines |
---|---|---|---|---|
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 |