From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 May 2015 04:00:27 +0000 (-0700)
Subject: Merge branch 'ld/p4-filetype-detection'
X-Git-Tag: v2.5.0-rc0~155
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a9d00b662f0fdb88434b85d2bd55ebfee227e0d7;p=git

Merge branch 'ld/p4-filetype-detection'

* ld/p4-filetype-detection:
  git-p4: fix filetype detection on files opened exclusively
  git-p4: small fix for locked-file-move-test
  git-p4: fix small bug in locked test scripts
---

a9d00b662f0fdb88434b85d2bd55ebfee227e0d7