builtin-merge: give a proper error message for invalid strategies in config
[gitweb.git] / gitk-git /
drwxr-xr-x   parent (dest: ; base: 1719b5e446f54e4196903ae6ed5f8867a5755bf6)
-rw-r--r-- 1771 Makefile
-rw-r--r-- 273636 gitk
drwxr-xr-x - po