merge-recursive: Fix code checking for D/F conflicts still being present

diff --git a/reflog-walk.h b/reflog-walk.h
index 7ca1438f4d74b652f962c6bdfddd08fe0d75802d..7bd2cd4c4e5cd9d51e645509eeacc49a83a44ba7 100644 (file)
--- a/reflog-walk.h
+++ b/reflog-walk.h
@@ -1,11 +1,22 @@
 #ifndef REFLOG_WALK_H
 #define REFLOG_WALK_H
 
+#include "cache.h"
+
+struct reflog_walk_info;
+
 extern void init_reflog_walk(struct reflog_walk_info** info);
 extern int add_reflog_for_walk(struct reflog_walk_info *info,
                struct commit *commit, const char *name);
 extern void fake_reflog_parent(struct reflog_walk_info *info,
                struct commit *commit);
-extern void show_reflog_message(struct reflog_walk_info *info, int, int);
+extern void show_reflog_message(struct reflog_walk_info *info, int,
+               enum date_mode);
+extern void get_reflog_message(struct strbuf *sb,
+               struct reflog_walk_info *reflog_info);
+extern void get_reflog_selector(struct strbuf *sb,
+               struct reflog_walk_info *reflog_info,
+               enum date_mode dmode,
+               int shorten);
 
 #endif