Add a second testcase for handling invalid strategies in git-merge
[gitweb.git] / perl /
drwxr-xr-x   parent (dest: ; base: dce61e728b89611109e76cbc9fa897fe49d7869d)
-rw-r--r-- 31454 Git.pm
-rw-r--r-- 1381 Makefile
-rw-r--r-- 745 Makefile.PL
-rw-r--r-- 19088 private-Error.pm