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.
Junio C Hamano committed
Mar 4, 2007 at 17:31 UTC
e6f95113431f7e69263bc3d075c0a7715ce587e3
No changes.