Add a second testcase for handling invalid strategies in git-merge
[gitweb.git] / git-gui /
drwxr-xr-x   parent (dest: ; base: dce61e728b89611109e76cbc9fa897fe49d7869d)
-rwxr-xr-x 1813 GIT-VERSION-GEN
-rw-r--r-- 11186 Makefile
-rwxr-xr-x 74243 git-gui.sh
drwxr-xr-x - lib
drwxr-xr-x - macosx
drwxr-xr-x - po
drwxr-xr-x - windows