From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 13 Apr 2011 20:55:53 +0000 (-0700)
Subject: Merge branch 'js/checkout-untracked-symlink' into maint
X-Git-Tag: v1.7.5-rc2~1^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=302de7a685952cddd764bd3ccd427d0cd9e67fdf;p=thirdparty%2Fgit.git

Merge branch 'js/checkout-untracked-symlink' into maint

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

302de7a685952cddd764bd3ccd427d0cd9e67fdf