Merge branch 'jc/merge-x-theirs-docfix' into maint
[git] / gitk-git /
drwxr-xr-x   ..
-rw-r--r-- 27 .gitignore
-rw-r--r-- 2208 Makefile
-rwxr-xr-x 351673 gitk
drwxr-xr-x - po