From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 24 Nov 2010 20:46:14 +0000 (-0800)
Subject: Merge branch 'aw/git-p4-deletion' into maint
X-Git-Tag: v1.7.3.3~23
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=385cc9d8c44eb5be9d57e630129752a72c0a08c8;p=git.git

Merge branch 'aw/git-p4-deletion' into maint

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

385cc9d8c44eb5be9d57e630129752a72c0a08c8