Remove filename from conflict markers
[gitweb.git] / t / t9700 /
drwxr-xr-x   parent (dest: t; base: 606475f3178784e5a6b3a01dce1a54314345cf43)
-rwxr-xr-x 4630 test.pl