mergetool: don't skip modify/remove conflicts
[gitweb.git] / t / t9700 /
drwxr-xr-x   parent (dest: t; base: 2f59c947044d535e078941711e562d825eb055e3)
-rwxr-xr-x 4960 test.pl