Handle core.symlinks=false case in merge-recursive.
[git/git-svn.git] / contrib / examples / 
treeeb1a1af65157d8636d6de4bce4cecf102b2a3a3d
drwxr-xr-x   ..
-rwxr-xr-x 2715 git-resolve.sh