merge script: allow custom strategies
[gitweb.git] / gitk-git /
drwxr-xr-x   parent (dest: ; base: e69dccf8cd4576be804597b2960aa7d0020a65db)
-rw-r--r-- 1771 Makefile
-rw-r--r-- 321995 gitk
drwxr-xr-x - po