From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 21 Oct 2011 23:04:33 +0000 (-0700)
Subject: Merge branch 'pw/p4-update'
X-Git-Tag: v1.7.8-rc0~25
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5a4fcc28e116f769abf94a0acc558fd37a44bcfb;p=git.git

Merge branch 'pw/p4-update'

* pw/p4-update:
  git-p4: handle files with shell metacharacters
  git-p4: keyword flattening fixes
  git-p4: stop ignoring apple filetype
  git-p4: recognize all p4 filetypes
  git-p4: handle utf16 filetype properly
  git-p4 tests: refactor and cleanup
---

5a4fcc28e116f769abf94a0acc558fd37a44bcfb