merge-recursive: refuse to merge binary files
[gitweb.git] / t / t9111 /
drwxr-xr-x   parent (dest: t; base: 9f30855)
-rw-r--r-- 7225 svnsync.dump