Merge branch 'jc/describe'

diff --git a/diff.c b/diff.c
index 156fec447061f83855edf27d578f055bb606cacf..052974eb9729cca92c9e86be6e71f46052bcb788 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -4662,7 +4662,7 @@ int diff_result_code(struct diff_options *opt, int status)
 {
        int result = 0;
 
-       diff_warn_rename_limit("diff.renamelimit",
+       diff_warn_rename_limit("diff.renameLimit",
                               opt->needed_rename_limit,
                               opt->degraded_cc_to_c);
        if (!DIFF_OPT_TST(opt, EXIT_WITH_STATUS) &&