Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with-dirty...
[git.git] / t / t4034 / ada / 
tree26b8e7b831f729cecb74e156c2169f58d7e29015
drwxr-xr-x   ..
-rw-r--r-- 1168 expect
-rw-r--r-- 148 post
-rw-r--r-- 149 pre