Merge branch 'rp/p4-filetype-change'
commitc7dd1c5818111a86deffde1190b57d07efbeed0a
authorJunio C Hamano <gitster@pobox.com>
Tue, 26 Jan 2016 23:40:29 +0000 (26 15:40 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 26 Jan 2016 23:40:29 +0000 (26 15:40 -0800)
tree6e63b77be1e5b97ad144c7dce4d7c5d4109afa6b
parent3c809405cb35679dd5205bf0ea118b7ee9256abb
parenta02b8bc4d7525896b5f20553dc10e7ada257046a
Merge branch 'rp/p4-filetype-change'

* rp/p4-filetype-change:
  git-p4.py: add support for filetype change