merge_file_one   1180 merge-recursive.c 		mfi = merge_file_one(o, one->path,
merge_file_one   1464 merge-recursive.c 					mfi = merge_file_one(o, ren1_dst, null_sha1, 0,