Which merge_file() function do you mean?
[git] / merge-blobs.h
2012-12-10  Junio C HamanoWhich merge_file() function do you mean?