| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | mergetools: add description to all diff/merge tools | Fernando Ramos | 2022-04-04 | 1 | -0/+8 |
| * | mergetools/xxdiff: prevent segfaults from stopping difftool | David Aguilar | 2021-10-13 | 1 | -0/+7 |
| * | Merge branch 'da/mergetool-xxdiff-hotkey' | Junio C Hamano | 2016-12-19 | 1 | -5/+5 |
| |\ | |||||
| | * | mergetools: fix xxdiff hotkeys | David Aguilar | 2016-12-12 | 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 |
 |
index : git | |
| git | Fast-forward packages |
| summaryrefslogtreecommitdiffstats |