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