From: Junio C Hamano <junkio@cox.net>
Date: Mon, 5 Mar 2007 01:31:09 +0000 (-0800)
Subject: Merge branch 'js/symlink'
X-Git-Tag: v1.5.1-rc1~97
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e6f95113431f7e69263bc3d075c0a7715ce587e3;p=git.git

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.
---

e6f95113431f7e69263bc3d075c0a7715ce587e3