Merge branch 'jk/add-i-diff-compact-heuristics' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 11 Jul 2016 17:44:09 +0000 (10:44 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 11 Jul 2016 17:44:09 +0000 (10:44 -0700)
commit52debb6...3198c50354c46a7745d45252b0989c7e
treec59e853...cb7463f3a75de2de809f522ebfbfddc2copy hash to clipboard (tree)
parent674d38f...5b6d6b9f1cea8821f09670e07c1c7961copy hash to clipboard (diff)
parent46e3d17...57f90538242b7a1dde126eba59f7c5abcopy hash to clipboard (diff)