merge-recursive: enforce rule that index matches head before merging
[gitweb.git] / t / t3901 /
drwxr-xr-x   parent (dest: t; base: eddd1a411d935420e1746108ecfee564114a129f)
-rwxr-xr-x 153 8859-1.txt
-rwxr-xr-x 155 utf8.txt