From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 9 Dec 2009 06:37:50 +0000 (-0800)
Subject: Merge branch 'jk/maint-add-p-delete-fix' into maint
X-Git-Tag: v1.6.6-rc2~4^2~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a876433c5fc27cc14860dea3d608ab4e0ff62380;p=git.git

Merge branch 'jk/maint-add-p-delete-fix' into maint

* jk/maint-add-p-delete-fix:
  add-interactive: fix deletion of non-empty files
---

a876433c5fc27cc14860dea3d608ab4e0ff62380