Merge branch 'da/smerge'

diff --git a/reachable.h b/reachable.h
index 3c00fa0526cd97e36111f2d94ccbf3d2817ccf34..18b0f9f2f0df0b6cceb67bc0eee81244e3c8a114 100644 (file)
--- a/reachable.h
+++ b/reachable.h
@@ -2,6 +2,8 @@
 #define REACHEABLE_H
 
 struct progress;
+struct rev_info;
+
 extern int add_unseen_recent_objects_to_traversal(struct rev_info *revs,
                                                  timestamp_t timestamp);
 extern void mark_reachable_objects(struct rev_info *revs, int mark_reflog,