Merge branch 'jc/ll-merge-expose-path'
authorJunio C Hamano <gitster@pobox.com>
Wed, 24 Jun 2015 19:21:45 +0000 (12:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 24 Jun 2015 19:21:45 +0000 (12:21 -0700)
commit49ac735...da163b0f8a32ce71723b2071f962d3fd
tree7fc5bde...77564c024ea04b583e9b109f127dd742copy hash to clipboard (tree)
parent6da9f88...daab2d18c1e5ae8252f631d38fb80e8acopy hash to clipboard (diff)
parentef45bb1...8156030446658d5bfb3983ce214a9e16copy hash to clipboard (diff)
Documentation/gitattributes.txt
t/t6026-merge-attr.sh