Merge branch 'da/difftool' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 4 Dec 2015 19:34:24 +0000 (11:34 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 4 Dec 2015 19:34:24 +0000 (11:34 -0800)
commitaa0b4c3...d9f21b806253ac16e59de82e2a5ec00e
treeba3f9fa...ade4c73e61ea6bc330c4c3bad68794b5copy hash to clipboard (tree)
parentb50ceab...8f46a74571ee2a89048563dd5d3322b9copy hash to clipboard (diff)
parentcfe2d4b...9126f03d8ca198f9da36762cdf59b52fcopy hash to clipboard (diff)