Andrew's git / gitweb.git / diff
?
Merge branch 'js/checkout-untracked-symlink' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 1 Apr 2011 23:19:03 +0000 (16:19 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 1 Apr 2011 23:19:03 +0000 (16:19 -0700)
* js/checkout-untracked-symlink:
do not overwrite untracked symlinks
Demonstrate breakage: checkout overwrites untracked symlink with directory

Trivial merge