git/merge-blobs.h

#ifndef MERGE_BLOBS_H
#define MERGE_BLOBS_H

#include "blob.h"

extern void *merge_blobs(const char *, struct blob *, struct blob *, struct blob *, unsigned long *);

#endif /* MERGE_BLOBS_H */
Which merge_file() function do you mean? There are two different static functions and one global function, all of them called "merge_file()", with different signatures and purposes. Rename them all to reduce confusion in "git grep" output: * Rename the static one in merge-index to "merge_one_path(const char path)" as that function is about asking an external command to resolve conflicts in one path. Rename the global one in merge-file.c that is only used by merge-tree to "merge_blobs()", as the function takes three blobs and returns the merged result only in-core, without doing anything to the filesystem. * Rename the one in merge-recursive to "merge_one_file()", just to be fair. Also rename merge-file.[ch] to merge-blobs.[ch]. Signed-off-by: Junio C Hamano <gitster@pobox.com> 2012-12-07 00:08:01 +01:00			`#ifndef MERGE_BLOBS_H`
			`#define MERGE_BLOBS_H`

			`#include "blob.h"`

			`extern void merge_blobs(const char , struct blob , struct blob , struct blob , unsigned long );`

			`#endif /* MERGE_BLOBS_H */`