merge-recursive: split out code for determining diff_filepairs

[thirdparty/git.git] / revision.h

diff --git a/revision.h b/revision.h
index 54761200adf2d5111b8aba097299bd2fd080a949..19dc9bdddba20dfa6ef1bdaaee0e82db3bdf8bd8 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -4,7 +4,7 @@
 #include "parse-options.h"
 #include "grep.h"
 #include "notes.h"
-#include "commit.h"
+#include "pretty.h"
 #include "diff.h"
 
 /* Remember to update object flag allocation in object.h */
@@ -121,7 +121,8 @@ struct rev_info {
                        bisect:1,
                        ancestry_path:1,
                        first_parent_only:1,
-                       line_level_traverse:1;
+                       line_level_traverse:1,
+                       tree_blobs_in_commit_order:1;
 
        /* Diff flags */
        unsigned int    diff:1,