Merge branch 'mm/discourage-commit-a-to-finish-conflict-resolution'
[gitweb.git] / gitk-git /
drwxr-xr-x   parent (dest: ; base: 785514bb5544fbe2604ea657530134671f82e4b1)
-rw-r--r-- 2158 Makefile
-rwxr-xr-x 346039 gitk
drwxr-xr-x - po