• J
    Merge branch 'js/symlink' · e6f95113
    Junio C Hamano 提交于
    * 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.
    e6f95113
diff-lib.c 16.4 KB