Merge branch 'da/mergetool-xxdiff-hotkey' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 23:11:05 +0000 (15:11 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 23:11:05 +0000 (15:11 -0800)
commit6d1f93a...fa79568ff60633ff09aa752f43cf8f5f
tree9a9ac6b...36c6e8001a8f6457395195a0a7f261a4copy hash to clipboard (tree)
parente4ec408...883c9076744561863f9913bdefec06cfcopy hash to clipboard (diff)
parent6cf5f6c...f7825ba73b3be0b2a2b381079d713bd1copy hash to clipboard (diff)
mergetools/xxdiff