Retire 'stupid' merge strategy
[gitweb.git] / gitk-git /
drwxr-xr-x   parent (dest: ; base: 51add76e92c9de9bcad3d421303b45ab488d529e)
-rw-r--r-- 1771 Makefile
-rw-r--r-- 273636 gitk
drwxr-xr-x - po