1 files changed, 17 insertions, 0 deletions
diff --git a/ll-merge.h b/ll-merge.h
new file mode 100644
index 0000000000..57889227b1
--- /dev/null
+++ b/ll-merge.h
@@ -0,0 +1,17 @@
+/*
+ * 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 flag);
+
+int ll_merge_marker_size(const char *path);
+
+#endif