aboutsummaryrefslogtreecommitdiff
path: root/mergetools/xxdiff
Commit message (Expand)AuthorAge
* Merge branch 'da/mergetool-xxdiff-hotkey'Junio C Hamano2016-12-19
|\
| * mergetools: fix xxdiff hotkeysDavid Aguilar2016-12-11
* | mergetool: honor mergetool.$tool.trustExitCode for built-in toolsDavid Aguilar2016-11-29
|/
* mergetool--lib: Refactor tools into separate filesDavid Aguilar2011-08-19