summaryrefslogtreecommitdiff
path: root/mergetools/xxdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'da/mergetool-xxdiff-hotkey'Junio C Hamano2016-12-191-5/+5
|\
| * mergetools: fix xxdiff hotkeysda/mergetool-xxdiff-hotkeyDavid Aguilar2016-12-111-5/+5
* | mergetool: honor mergetool.$tool.trustExitCode for built-in toolsDavid Aguilar2016-11-291-2/+0
|/
* mergetool--lib: Refactor tools into separate filesDavid Aguilar2011-08-191-0/+25