t6036: Test index and worktree state, not just that merge fails
[gitweb.git] / contrib / p4import /
drwxr-xr-x   parent (dest: contrib; base: c976260d0f3d3f99dc3594e3f98436bfd920dc97)
-rw-r--r-- 70 README
-rw-r--r-- 10722 git-p4import.py
-rw-r--r-- 4778 git-p4import.txt