| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | mergetools/vimdiff: add vimdiff1 merge tool variant | Seth House | 2021-02-23 | 1 | -1/+12 |
| * | mergetools: add support for nvimdiff (neovim) family | pudinha | 2020-07-29 | 1 | -6/+9 |
| * | mergetool--lib: improve support for vimdiff-style tool variants | pudinha | 2020-07-29 | 1 | -0/+8 |
| * | mergetools/vimdiff: trust Vim's exit code | David Aguilar | 2016-11-29 | 1 | -0/+4 |
| * | mergetool: honor mergetool.$tool.trustExitCode for built-in tools | David Aguilar | 2016-11-29 | 1 | -2/+0 |
| * | mergetool: reorder vim/gvim buffers in three-way diffs | Dickson Wong | 2016-02-12 | 1 | -2/+2 |
| * | mergetools: add vimdiff3 mode | Felipe Contreras | 2014-04-22 | 1 | -2/+12 |
| * | mergetools: simplify how we handle "vim" and "defaults" | David Aguilar | 2013-01-29 | 1 | -0/+36 |
 |
index : git | |
| git | Fast-forward packages |
| summaryrefslogtreecommitdiffstats |