recursive merge: add a recursion limit

1 files changed, 8 insertions, 0 deletions

diff --git a/include/git2/merge.h b/include/git2/merge.h
index a272e8be4..af53ead22 100644
--- a/include/git2/merge.h
+++ b/include/git2/merge.h
@@ -265,6 +265,14 @@ typedef struct {
 	/** Pluggable similarity metric; pass NULL to use internal metric */
 	git_diff_similarity_metric *metric;
 
+	/**
+	 * Maximum number of times to merge common ancestors to build a
+	 * virtual merge base when faced with criss-cross merges.  When this
+	 * limit is reached, the next ancestor will simply be used instead of
+	 * attempting to merge it.  The default is unlimited.
+	 */
+	unsigned int recursion_limit;
+
 	/** Flags for handling conflicting content. */
 	git_merge_file_favor_t file_favor;