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