From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 26 Jan 2016 23:40:29 +0000 (-0800)
Subject: Merge branch 'rp/p4-filetype-change'
X-Git-Tag: v2.8.0-rc0~99
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c7dd1c5818111a86deffde1190b57d07efbeed0a;p=git

Merge branch 'rp/p4-filetype-change'

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

c7dd1c5818111a86deffde1190b57d07efbeed0a