Andrew's git / gitweb.git / diff
?
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)
* rp/p4-filetype-change:
git-p4.py: add support for filetype change

Trivial merge