t6036: add a failed conflict detection case: regular files, different modes
[gitweb.git] / t / t3901 /
drwxr-xr-x   parent (dest: t; base: 5d1daf30cce5744b219002e0a6da015a13216cd1)
-rwxr-xr-x 153 8859-1.txt
-rwxr-xr-x 155 utf8.txt