merge-recursive: make the error-message generation an extern function

diff --git a/revision.h b/revision.h
index b10984b603467f2424a282d013e291d67886381e..b6421a64321168237443ecb7e56e6b0765256c8b 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -81,7 +81,8 @@ struct rev_info {
                        show_merge:1,
                        abbrev_commit:1,
                        use_terminator:1,
-                       missing_newline:1;
+                       missing_newline:1,
+                       date_mode_explicit:1;
        enum date_mode date_mode;
 
        unsigned int    abbrev;
@@ -168,6 +169,7 @@ enum commit_action {
        commit_error
 };
 
+extern enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit);
 extern enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit);
 
 #endif