t6036: Test index and worktree state, not just that merge fails
[gitweb.git] / block-sha1 /
drwxr-xr-x   parent (dest: ; base: c976260d0f3d3f99dc3594e3f98436bfd920dc97)
-rw-r--r-- 8584 sha1.c
-rw-r--r-- 692 sha1.h