xdl_merge(): fix a segmentation fault when refining conflicts

[git.git] / revision.h

diff --git a/revision.h b/revision.h
index f92a4d43752e02a9d1ced62b3c3c35943cb72965..ec991e5c57039a57af7c63db483e5b108a25ad16 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -41,6 +41,7 @@ struct rev_info {
                        limited:1,
                        unpacked:1, /* see also ignore_packed below */
                        boundary:1,
+                       left_right:1,
                        parents:1;
 
        /* Diff flags */
@@ -76,6 +77,7 @@ struct rev_info {
        struct grep_opt *grep_filter;
 
        /* special limits */
+       int skip_count;
        int max_count;
        unsigned long max_age;
        unsigned long min_age;