Commit message (Expand) | Author | Age | |
---|---|---|---|
* | mergetools/vimdiff: trust Vim's exit code | David Aguilar | 2016-11-29 |
* | mergetool: honor mergetool.$tool.trustExitCode for built-in tools | David Aguilar | 2016-11-29 |
* | mergetool: reorder vim/gvim buffers in three-way diffs | Dickson Wong | 2016-02-12 |
* | mergetools: add vimdiff3 mode | Felipe Contreras | 2014-04-22 |
* | mergetools: simplify how we handle "vim" and "defaults" | David Aguilar | 2013-01-28 |