Code

Merge branch 'jk/maint-add-p-delete-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 9 Dec 2009 06:37:50 +0000 (22:37 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 9 Dec 2009 06:37:50 +0000 (22:37 -0800)
commita876433c5fc27cc14860dea3d608ab4e0ff62380
treecfe391565fbf9c93b86ebd53f2d6b63bb99b6a74
parentaa031314bf8189a15290d5bd0d85fa2a0307ceb7
parent8947fdd598848b8ceb2cea9ff42e906c946eae5c
Merge branch 'jk/maint-add-p-delete-fix' into maint

* jk/maint-add-p-delete-fix:
  add-interactive: fix deletion of non-empty files
git-add--interactive.perl
t/t3701-add-interactive.sh