Merge branch 'js/checkout-untracked-symlink'
commit9db19414582fdb154384ff1ca457cbf9095fef48
authorJunio C Hamano <gitster@pobox.com>
Tue, 12 Apr 2011 07:05:50 +0000 (12 00:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 12 Apr 2011 07:05:50 +0000 (12 00:05 -0700)
treef4df277813e7f47071ef89189ba72754c2822c0a
parent5dee1532e1c8e8eb31bfa437b5ff00ea0acb6f08
parent9973d9329b71556178ef32b4f8cfedab009a18d8
Merge branch 'js/checkout-untracked-symlink'

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