summaryrefslogtreecommitdiff
path: root/mergetools/xxdiff
AgeCommit message (Expand)Author
2017-01-17Merge branch 'da/mergetool-xxdiff-hotkey' into maintJunio C Hamano
2016-12-12mergetools: fix xxdiff hotkeysDavid Aguilar
2016-11-29mergetool: honor mergetool.$tool.trustExitCode for built-in toolsDavid Aguilar
2011-08-19mergetool--lib: Refactor tools into separate filesDavid Aguilar