diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-04-01 16:19:03 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-04-01 16:19:03 -0700 |
commit | 46a1f0728c6b5a886424e74c8bcacedf355eb918 (patch) | |
tree | 4b3e2bf7d605858408c17e0774248a0f9af227ec /t/t5100/info0016 | |
parent | d12d8ec9d728b0ce148f5a5caa68c858ef180d30 (diff) | |
parent | 1d718a5108f905e3c64f9fa791e67a52bd926457 (diff) | |
download | git-46a1f0728c6b5a886424e74c8bcacedf355eb918.tar.gz git-46a1f0728c6b5a886424e74c8bcacedf355eb918.tar.xz |
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
Diffstat (limited to 't/t5100/info0016')
0 files changed, 0 insertions, 0 deletions