Add a second testcase for handling invalid strategies in git-merge
[gitweb.git] / gitk-git /
drwxr-xr-x   parent (dest: ; base: dce61e728b89611109e76cbc9fa897fe49d7869d)
-rw-r--r-- 1771 Makefile
-rw-r--r-- 273636 gitk
drwxr-xr-x - po