t6036: Test index and worktree state, not just that merge fails
[gitweb.git] / gitk-git /
drwxr-xr-x   parent (dest: ; base: c976260d0f3d3f99dc3594e3f98436bfd920dc97)
-rw-r--r-- 1771 Makefile
-rw-r--r-- 321995 gitk
drwxr-xr-x - po