git/merge-blobs.h

#ifndef MERGE_BLOBS_H
#define MERGE_BLOBS_H

struct blob;
struct index_state;

extern void *merge_blobs(struct index_state *, 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-06 23:08:01 +00:00			`#ifndef MERGE_BLOBS_H`
			`#define MERGE_BLOBS_H`

merge-blobs.c: remove implicit dependency on the_index Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2018-09-21 15:57:28 +00:00			`struct blob;`
			`struct index_state;`
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-06 23:08:01 +00:00
merge-blobs.c: remove implicit dependency on the_index Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2018-09-21 15:57:28 +00:00			`extern void merge_blobs(struct index_state , const char *,`
			`struct blob , struct blob ,`
			`struct blob , unsigned long );`
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-06 23:08:01 +00:00
			`#endif /* MERGE_BLOBS_H */`