diff options
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sequencer.c b/sequencer.c index 6d027b06c8..1aa769c82d 100644 --- a/sequencer.c +++ b/sequencer.c @@ -462,6 +462,7 @@ static int do_recursive_merge(struct commit *base, struct commit *next, 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) return clean; |