Merge branch 'js/symlink'
* js/symlink: Tell multi-parent diff about core.symlinks. Handle core.symlinks=false case in merge-recursive. Add core.symlinks to mark filesystems that do not support symbolic links.
Showing
t/t2102-update-index-symlinks.sh
0 → 100755
t/t6025-merge-symlinks.sh
0 → 100644
想要评论请 注册 或 登录