mergetool: don't skip modify/remove conflicts
[gitweb.git] / t / t7500 /
drwxr-xr-x   parent (dest: t; base: 2f59c947044d535e078941711e562d825eb055e3)
-rwxr-xr-x 88 add-comments
-rwxr-xr-x 47 add-content
-rwxr-xr-x 63 add-signed-off
-rwxr-xr-x 77 edit-content