merge-recursive --patience

[git.git] / merge-recursive.h

diff --git a/merge-recursive.h b/merge-recursive.h
index 37ff99a2981dc618acdd5c7b1197ba20b9a53f4b..d21b446a1df8add6f2824c77a8896b9098d5c0fa 100644 (file)
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -15,6 +15,7 @@ struct merge_options {
        const char *subtree_shift;
        unsigned buffer_output : 1;
        unsigned renormalize : 1;
+       long xdl_opts;
        int verbosity;
        int diff_rename_limit;
        int merge_rename_limit;