merge-recursive: avoid clobbering untracked files with directory renames
[gitweb.git] / t / t3901 /
drwxr-xr-x   parent (dest: t; base: 79c47598f5c8c0008ae9281f20c2a041d4cabd93)
-rwxr-xr-x 153 8859-1.txt
-rwxr-xr-x 155 utf8.txt