Test 'checkout -m -- path'

diff --git a/diff.h b/diff.h
index 310bd6b2832ce7f874aff735bb19b4813f117d4d..007a0554d4b252e83e98f5578758d51ec0c6e120 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -110,7 +110,8 @@ struct diff_options {
        int pickaxe_opts;
        int rename_score;
        int rename_limit;
-       int warn_on_too_large_rename;
+       int needed_rename_limit;
+       int show_rename_progress;
        int dirstat_percent;
        int setup;
        int abbrev;