merge-recursive: fix the fix to the diff3 common ancestor label

[thirdparty/git.git] / sequencer.c

diff --git a/sequencer.c b/sequencer.c
index c4ed30f1b41a7212336c6832ec04588b4b535aae..094a4dd03d5a976cf55dbf061780e694ec70c010 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -617,7 +617,6 @@ static int do_recursive_merge(struct repository *r,
        if (is_rebase_i(opts) && clean <= 0)
                fputs(o.obuf.buf, stdout);
        strbuf_release(&o.obuf);
-       diff_warn_rename_limit("merge.renamelimit", o.needed_rename_limit, 0);
        if (clean < 0) {
                rollback_lock_file(&index_lock);
                return clean;