summaryrefslogtreecommitdiff
path: root/mergetools/xxdiff
AgeCommit message (Expand)AuthorFilesLines
2017-01-17Merge branch 'da/mergetool-xxdiff-hotkey' into maintLibravatar Junio C Hamano1-5/+5
2016-12-11mergetools: fix xxdiff hotkeysLibravatar David Aguilar1-5/+5
2016-11-29mergetool: honor mergetool.$tool.trustExitCode for built-in toolsLibravatar David Aguilar1-2/+0
2011-08-19mergetool--lib: Refactor tools into separate filesLibravatar David Aguilar1-0/+25