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