Merge branch 'en/directory-renames-nothanks'
[git/git.git] / merge-recursive.h
index 0c46a5a..e6a0828 100644 (file)
@@ -20,6 +20,7 @@ struct merge_options {
        unsigned renormalize : 1;
        long xdl_opts;
        int verbosity;
+       int detect_directory_renames;
        int diff_detect_rename;
        int merge_detect_rename;
        int diff_rename_limit;