t6036: Test index and worktree state, not just that merge fails
[gitweb.git] / t / t4020 /
drwxr-xr-x   parent (dest: t; base: c976260d0f3d3f99dc3594e3f98436bfd920dc97)
-rw-r--r-- 116 diff.NUL