t6036: Test index and worktree state, not just that merge fails
[gitweb.git] / contrib / workdir /
drwxr-xr-x   parent (dest: contrib; base: c976260d0f3d3f99dc3594e3f98436bfd920dc97)
-rwxr-xr-x 1886 git-new-workdir