Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | mergetools/bc: add `bc4` to the alias list for Beyond Compare | Johannes Schindelin | 2020-11-11 | 1 | -0/+1 |
* | mergetool--lib: improve support for vimdiff-style tool variants | pudinha | 2020-07-29 | 1 | -0/+5 |
* | mergetool: honor mergetool.$tool.trustExitCode for built-in tools | David Aguilar | 2016-11-29 | 1 | -2/+0 |
* | mergetool: rename bc3 to bc | Junio C Hamano | 2014-10-21 | 1 | -0/+25 |