Merge branch 'tr/maint-merge-ours-clarification' (early part)
[git] / gitk-git /
drwxr-xr-x   ..
-rw-r--r-- 1771 Makefile
-rw-r--r-- 312236 gitk
drwxr-xr-x - po