merge-recursive: make sure when we say we abort that we actually abort
[gitweb.git] / t / t4020 /
drwxr-xr-x   parent (dest: t; base: 92702392cefdbd66ca593fa909540230ef9e005e)
-rw-r--r-- 116 diff.NUL