Merge branch 'jk/grep-binary-workaround-in-test' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Mar 2016 19:13:45 +0000 (11:13 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Mar 2016 19:13:45 +0000 (11:13 -0800)
commit7f18fad...bc409c24d9d76a913eb280db74b8a89a
treeb4efa6a...1ec1d4c09139af81ec6487eeb3a104a5copy hash to clipboard (tree)
parentd4e7b9b...b0ca9ef976b765b0daf29b4c1466db48copy hash to clipboard (diff)
parent3b1442d...d23577ed3570023d338cd12298b16867copy hash to clipboard (diff)