am: avoid directory rename detection when calling recursive merge machinery

diff --git a/merge-recursive.h b/merge-recursive.h
index fa7bc6b6836f99ab9c417e2865cd5a544488d025..e39ee5d78be6bb460bef18aac61deb1ca9b55da0 100644 (file)
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -18,6 +18,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;