"reset --merge": fix unmerged case
[gitweb.git] / gitk-git /
drwxr-xr-x   parent (dest: ; base: e11d7b5969704cd5ce39d053414d905bb203886b)
-rw-r--r-- 1771 Makefile
-rw-r--r-- 321008 gitk
drwxr-xr-x - po