Merge branch 'jk/maint-rmdir-fix' into maint-1.6.6
commitcb16bcc36965f28845e4fae15c36280a2506f1be
authorJunio C Hamano <gitster@pobox.com>
Sun, 7 Mar 2010 22:53:50 +0000 (7 14:53 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 7 Mar 2010 22:53:50 +0000 (7 14:53 -0800)
treea1acd0c9c1b89d30749f4414d727064f1c416fd5
parent11a1a49a16a52ff9b684a430d68b8982ed313427
parent3fc0d131c573f6f774e2e4abba9cbda694b08321
Merge branch 'jk/maint-rmdir-fix' into maint-1.6.6

* jk/maint-rmdir-fix:
  rm: fix bug in recursive subdirectory removal
dir.c