Andrew's git / gitweb.git / diff
?
Merge branch 'js/checkout-untracked-symlink'
authorJunio C Hamano <gitster@pobox.com>
Wed, 9 Mar 2011 23:54:04 +0000 (15:54 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 9 Mar 2011 23:54:04 +0000 (15:54 -0800)
* js/checkout-untracked-symlink:
do not overwrite untracked symlinks
Demonstrate breakage: checkout overwrites untracked symlink with directory

Trivial merge