Merge branch 'ew/empty-merge-with-dirty-index'
[git] / t / t4034 / pascal /
drwxr-xr-x   ..
-rw-r--r-- 2045 expect
-rw-r--r-- 238 post
-rw-r--r-- 232 pre