Merge branch 'ew/empty-merge-with-dirty-index'
[git] / t / t4020 /
drwxr-xr-x   ..
-rw-r--r-- 116 diff.NUL