merge-recursive: check for file level conflicts then get new name
[gitweb.git] / t / t3901 /
drwxr-xr-x   parent (dest: t; base: f6f775591881036a3c4bfcf6737c9119c251537d)
-rwxr-xr-x 153 8859-1.txt
-rwxr-xr-x 155 utf8.txt