merge-recursive: don't segfault while handling rename clashes
[gitweb.git] / t / t4020 /
drwxr-xr-x   parent (dest: t; base: c94736a)
-rw-r--r-- 116 diff.NUL