From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 1 Apr 2011 23:19:03 +0000 (-0700)
Subject: Merge branch 'js/checkout-untracked-symlink' into maint
X-Git-Tag: v1.7.4.3~11
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=46a1f0728c6b5a886424e74c8bcacedf355eb918;p=git.git

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

* js/checkout-untracked-symlink:
  do not overwrite untracked symlinks
  Demonstrate breakage: checkout overwrites untracked symlink with directory
---

46a1f0728c6b5a886424e74c8bcacedf355eb918