| commit | a9d00b662f0fdb88434b85d2bd55ebfee227e0d7 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 6 May 2015 04:00:27 +0000 (5 21:00 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 6 May 2015 04:00:28 +0000 (5 21:00 -0700) | ||
| tree | 07d96aeadb52c7ac626a9a1adaa4ac952b62f5f5 | treesnapshot (tar.gz zip) |
| parent | e971a1f9d52295503b7ea0cdb75e46470d5d5d8a | commitdiff |
| parent | 34a0dbfc6b7463a68df79d5773102f85e56cbe4d | commitdiff |
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
* 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