![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 1 Apr 2011 23:19:03 +0000 (16:19 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 1 Apr 2011 23:19:03 +0000 (16:19 -0700) | ||
| commit | 46a1f0728c6b5a886424e74c8bcacedf355eb918 | |
| tree | 4b3e2bf7d605858408c17e0774248a0f9af227ec | tree | snapshot |
| parent | d12d8ec9d728b0ce148f5a5caa68c858ef180d30 | commit | diff |
| parent | 1d718a5108f905e3c64f9fa791e67a52bd926457 | commit | diff |
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
* js/checkout-untracked-symlink:
do not overwrite untracked symlinks
Demonstrate breakage: checkout overwrites untracked symlink with directory