test that git status works with merge conflict in, .gitmodules
[gitweb.git] / gitk-git /
drwxr-xr-x   parent (dest: ; base: 44ca0c8ed927c8e7525ceec412704ff9967ff6ac)
-rw-r--r-- 1771 Makefile
-rwxr-xr-x 324172 gitk
drwxr-xr-x - po