Use extended SHA1 syntax in merge-recursive conflicts.

[git.git] / revision.h

diff --git a/revision.h b/revision.h
index 3adab9590a14e25c2659a1933db4af456c263a5b..4585463a44c9faecdcdf4454b735b1e4ba1335aa 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -9,6 +9,7 @@
 #define BOUNDARY       (1u<<5)
 #define BOUNDARY_SHOW  (1u<<6)
 #define ADDED          (1u<<7) /* Parents already parsed and added? */
+#define SYMMETRIC_LEFT (1u<<8)
 
 struct rev_info;
 struct log_info;
@@ -40,6 +41,7 @@ struct rev_info {
                        limited:1,
                        unpacked:1, /* see also ignore_packed below */
                        boundary:1,
+                       left_right:1,
                        parents:1;
 
        /* Diff flags */