From 525ab63950e324823dd45423104cdcf5e46e2610 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 24 Dec 2007 00:36:00 -0800 Subject: merge-recursive: split low-level merge functions out. This moves low-level merge functions out of merge-recursive.c and places them in a new separate file, ll-merge.c Signed-off-by: Junio C Hamano --- ll-merge.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 ll-merge.h (limited to 'll-merge.h') diff --git a/ll-merge.h b/ll-merge.h new file mode 100644 index 000000000..5388422d0 --- /dev/null +++ b/ll-merge.h @@ -0,0 +1,15 @@ +/* + * Low level 3-way in-core file merge. + */ + +#ifndef LL_MERGE_H +#define LL_MERGE_H + +int ll_merge(mmbuffer_t *result_buf, + const char *path, + mmfile_t *ancestor, + mmfile_t *ours, const char *our_label, + mmfile_t *theirs, const char *their_label, + int virtual_ancestor); + +#endif -- cgit v1.2.1