Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with-dirty...
[git] / contrib / workdir /
drwxr-xr-x   ..
-rw-r--r-- 24 .gitattributes
-rwxr-xr-x 2402 git-new-workdir