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)
* js/checkout-untracked-symlink:
  t2021: mark a test as fixed


Trivial merge