merge-recursive: consolidate unnecessary fields in merge_options

[thirdparty/git.git] / merge-recursive.h

diff --git a/merge-recursive.h b/merge-recursive.h
index 0fdae904dd5ace4813dd3de2e29be74316d9d570..f4bdfbc897a3fd3ed3b7ece0444bc76e2a2cf674 100644 (file)
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -27,10 +27,8 @@ struct merge_options {
                MERGE_DIRECTORY_RENAMES_CONFLICT = 1,
                MERGE_DIRECTORY_RENAMES_TRUE = 2
        } detect_directory_renames;
-       int diff_detect_rename;
-       int merge_detect_rename;
-       int diff_rename_limit;
-       int merge_rename_limit;
+       int detect_renames;
+       int rename_limit;
        int rename_score;
        int needed_rename_limit;
        int show_rename_progress;