checkout -m: attempt merge when deletion of path was staged
[gitweb.git] / t / t4034 / ada /
drwxr-xr-x   parent (dest: t/t4034; base: 6a143aa2b2)
-rw-r--r-- 1150 expect
-rw-r--r-- 148 post
-rw-r--r-- 149 pre