X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=builtin-merge-recursive.c;h=46e636fdcf1cb854a486e425df05a2485d18d5d7;hb=9d880582ee0e63b3865350e90d3576fec55aed20;hp=3902e910694e00dead5154ad8dfe8c1f231e20a2;hpb=50705915eae89eae490dff30fa370ed02e4d6e72;p=git.git

diff --git a/builtin-merge-recursive.c b/builtin-merge-recursive.c
index 3902e9106..46e636fdc 100644
--- a/builtin-merge-recursive.c
+++ b/builtin-merge-recursive.c
@@ -365,6 +365,7 @@ static struct path_list *get_renames(struct tree *tree,
 	opts.rename_limit = merge_rename_limit >= 0 ? merge_rename_limit :
 			    diff_rename_limit >= 0 ? diff_rename_limit :
 			    500;
+	opts.warn_on_too_large_rename = 1;
 	opts.output_format = DIFF_FORMAT_NO_OUTPUT;
 	if (diff_setup_done(&opts) < 0)
 		die("diff setup failed");