t6021: add a new test for git-merge-resolve

diff --git a/revision.h b/revision.h
index 201bd97c58d7852d07560e5f79c7dcd850803dc7..abce5001f19a60bb15b519b26773b57c83563021 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -66,7 +66,8 @@ struct rev_info {
        /* Format info */
        unsigned int    shown_one:1,
                        abbrev_commit:1,
-                       use_terminator:1;
+                       use_terminator:1,
+                       missing_newline:1;
        enum date_mode date_mode;
 
        const char **ignore_packed; /* pretend objects in these are unpacked */
@@ -89,6 +90,9 @@ struct rev_info {
        /* Filter by commit log message */
        struct grep_opt *grep_filter;
 
+       /* Display history graph */
+       struct git_graph *graph;
+
        /* special limits */
        int skip_count;
        int max_count;