summaryrefslogtreecommitdiff
path: root/ll-merge.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-12-24 00:36:00 -0800
committerJunio C Hamano <gitster@pobox.com>2008-02-18 00:46:13 -0800
commit525ab63950e324823dd45423104cdcf5e46e2610 (patch)
tree4ab4dcee4a942ad6b0877bfc1f508d34932a339a /ll-merge.h
parent3d51e1b5b84bde24f9a19e3cee603f0b57f62001 (diff)
downloadgit-525ab63950e324823dd45423104cdcf5e46e2610.tar.gz
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 <gitster@pobox.com>
Diffstat (limited to 'll-merge.h')
-rw-r--r--ll-merge.h15
1 files changed, 15 insertions, 0 deletions
diff --git a/ll-merge.h b/ll-merge.h
new file mode 100644
index 0000000000..5388422d09
--- /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