merge-recursive: fix remaining directory rename + dirty overwrite cases
[gitweb.git] / t / t3901 /
drwxr-xr-x   parent (dest: t; base: 18797a3b10e4077473740b953651b0032828d0fb)
-rwxr-xr-x 153 8859-1.txt
-rwxr-xr-x 155 utf8.txt