am -3: do not let failed merge from completing the error codepath
[gitweb.git] / merge-blobs.c
2012-12-10 Which merge_file() function do you mean?