builtin-merge: give a proper error message for invalid strategies in config
[gitweb.git] / git-gui /
drwxr-xr-x   parent (dest: ; base: 1719b5e446f54e4196903ae6ed5f8867a5755bf6)
-rwxr-xr-x 1813 GIT-VERSION-GEN
-rw-r--r-- 11186 Makefile
-rwxr-xr-x 73976 git-gui.sh
drwxr-xr-x - lib
drwxr-xr-x - macosx
drwxr-xr-x - po
drwxr-xr-x - windows