![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Mon, 5 Mar 2007 01:31:09 +0000 (17:31 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Mon, 5 Mar 2007 01:31:09 +0000 (17:31 -0800) | ||
| commit | e6f95113431f7e69263bc3d075c0a7715ce587e3 | |
| tree | 810569356f64b58df52560fcce0d3cfb561014ab | tree | snapshot |
| parent | 784b11cd05e7862b0fbcc1251a65669c7004a8df | commit | diff |
| parent | a249a9b5a26e841a28f6e993a560d749303cf91c | commit | diff |
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.
* 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.
| Documentation/config.txt | diff1 | | diff2 | | blob | history |
| diff-lib.c | diff1 | | diff2 | | blob | history |