am -3: do not let failed merge from completing the error codepath
[gitweb.git] / t / t4034 / tex /
drwxr-xr-x   parent (dest: t/t4034; base: c63d4b2)
-rw-r--r-- 343 expect
-rw-r--r-- 84 post
-rw-r--r-- 72 pre