merge-recursive: avoid incorporating uncommitted changes in a merge
[gitweb.git] / t / t3901 /
drwxr-xr-x   parent (dest: t; base: 65170c07d4)
-rwxr-xr-x 153 8859-1.txt
-rwxr-xr-x 155 utf8.txt