From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 9 Mar 2011 23:54:04 +0000 (-0800)
Subject: Merge branch 'js/checkout-untracked-symlink'
X-Git-Tag: v1.7.5-rc0~89
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=75618f1106b95defafca698d5cfdfd3dfb3a7e3c;p=git.git

Merge branch 'js/checkout-untracked-symlink'

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

75618f1106b95defafca698d5cfdfd3dfb3a7e3c