Handle core.symlinks=false case in merge-recursive.
[git/git-svn.git] / contrib / vim / 
treec1e90866be2039a61d5a6d0c0da8d288ecb8757b
drwxr-xr-x   ..
-rw-r--r-- 360 README
drwxr-xr-x - syntax