am -3: do not let failed merge from completing the error codepath
[gitweb.git] / t / t4020 /
drwxr-xr-x   parent (dest: t; base: c63d4b2)
-rw-r--r-- 116 diff.NUL