Merge branch 'rp/p4-filetype-change'
authorJunio C Hamano <gitster@pobox.com>
Tue, 26 Jan 2016 23:40:29 +0000 (15:40 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 26 Jan 2016 23:40:29 +0000 (15:40 -0800)
commitc7dd1c5...18111a86deffde1190b57d07efbeed0a
tree6e63b77...e1e5b97ad144c7dce4d7c5d4109afa6bcopy hash to clipboard (tree)
parent3c80940...cb35679dd5205bf0ea118b7ee9256abbcopy hash to clipboard (diff)
parenta02b8bc...d7525896b5f20553dc10e7ada257046acopy hash to clipboard (diff)