am -3: do not let failed merge from completing the error codepath
[git] / t / t9603 /
drwxr-xr-x   ..
drwxr-xr-x - cvsroot