From: Junio C Hamano Date: Tue, 12 Apr 2011 07:05:50 +0000 (-0700) Subject: Merge branch 'js/checkout-untracked-symlink' X-Git-Tag: v1.7.5-rc2~4 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9db19414582fdb154384ff1ca457cbf9095fef48;p=git.git Merge branch 'js/checkout-untracked-symlink' * js/checkout-untracked-symlink: t2021: mark a test as fixed --- 9db19414582fdb154384ff1ca457cbf9095fef48