Age | Commit message (Expand) | Author | Files | Lines |
---|---|---|---|---|
2016-11-29 | mergetools/vimdiff: trust Vim's exit code | 1 | -0/+4 | |
2016-11-29 | mergetool: honor mergetool.$tool.trustExitCode for built-in tools | 1 | -2/+0 | |
2016-02-12 | mergetool: reorder vim/gvim buffers in three-way diffs | 1 | -2/+2 | |
2014-04-22 | mergetools: add vimdiff3 mode | 1 | -2/+12 | |
2013-01-28 | mergetools: simplify how we handle "vim" and "defaults" | 1 | -0/+36 |