Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'da/mergetool-xxdiff-hotkey' | Junio C Hamano | 2016-12-19 | 1 | -5/+5 |
|\ | |||||
| * | mergetools: fix xxdiff hotkeysda/mergetool-xxdiff-hotkey | David Aguilar | 2016-12-11 | 1 | -5/+5 |
* | | mergetool: honor mergetool.$tool.trustExitCode for built-in tools | David Aguilar | 2016-11-29 | 1 | -2/+0 |
|/ | |||||
* | mergetool--lib: Refactor tools into separate files | David Aguilar | 2011-08-19 | 1 | -0/+25 |