refuse to merge during a merge
[gitweb.git] / gitk-git /
drwxr-xr-x   parent (dest: ; base: c8c562a238071843c64ea0f3a2c85481606da379)
-rw-r--r-- 1771 Makefile
-rw-r--r-- 307419 gitk
drwxr-xr-x - po