Add a second testcase for handling invalid strategies in git-merge
[gitweb.git] / t / t7500 /
drwxr-xr-x   parent (dest: t; base: dce61e728b89611109e76cbc9fa897fe49d7869d)
-rwxr-xr-x 88 add-comments
-rwxr-xr-x 47 add-content
-rwxr-xr-x 63 add-signed-off