From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 5 Nov 2010 17:42:46 +0000 (-0700)
Subject: Merge branch 'aw/git-p4-deletion'
X-Git-Tag: v1.7.4-rc0~154
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3089c2b97a4d73866375a0ba815fc2fa4e2a1c1e;p=git.git

Merge branch 'aw/git-p4-deletion'

* aw/git-p4-deletion:
  Fix handling of git-p4 on deleted files
---

3089c2b97a4d73866375a0ba815fc2fa4e2a1c1e