Code

Merge branch 'js/checkout-untracked-symlink' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 13 Apr 2011 20:55:53 +0000 (13:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 13 Apr 2011 20:55:53 +0000 (13:55 -0700)
commit302de7a685952cddd764bd3ccd427d0cd9e67fdf
treeb5c516b1ce294c475692fa7a9412220946b4d749
parent5fb41b883a5d0f9cbc4c6c693e6d84a8a5cee17e
parent9973d9329b71556178ef32b4f8cfedab009a18d8
Merge branch 'js/checkout-untracked-symlink' into maint

* js/checkout-untracked-symlink:
  t2021: mark a test as fixed