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.

diff --cc Documentation/config.txt
Simple merge

diff --cc diff-lib.c
Simple merge