| Age | Commit message (Expand) | Author |
|---|---|---|
| 2022-04-03 | mergetools: add description to all diff/merge tools | Fernando Ramos |
| 2021-10-13 | mergetools/xxdiff: prevent segfaults from stopping difftool | David Aguilar |
| 2016-12-19 | Merge branch 'da/mergetool-xxdiff-hotkey' | Junio C Hamano |
| 2016-12-11 | mergetools: fix xxdiff hotkeys | David Aguilar |
| 2016-11-29 | mergetool: honor mergetool.$tool.trustExitCode for built-in tools | David Aguilar |
| 2011-08-19 | mergetool--lib: Refactor tools into separate files | David Aguilar |
