Merge branch 'jc/maint-checkout-keep-remove'
authorJunio C Hamano <gitster@pobox.com>
Tue, 16 Sep 2008 07:49:59 +0000 (00:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 Sep 2008 07:49:59 +0000 (00:49 -0700)
* jc/maint-checkout-keep-remove:
  checkout: do not lose staged removal

1  2 
builtin-checkout.c

Simple merge