merge-trees: let caller decide whether to renormalize

diff --git a/bisect.h b/bisect.h
index fb744fdb79e1dd4a46cd3f2759b73747d8e79fbd..0862ce56d76e9b08ab913e6a472fac590974340e 100644 (file)
--- a/bisect.h
+++ b/bisect.h
@@ -7,7 +7,9 @@ extern struct commit_list *find_bisection(struct commit_list *list,
 
 extern struct commit_list *filter_skipped(struct commit_list *list,
                                          struct commit_list **tried,
-                                         int show_all);
+                                         int show_all,
+                                         int *count,
+                                         int *skipped_first);
 
 extern void print_commit_list(struct commit_list *list,
                              const char *format_cur,
@@ -25,8 +27,6 @@ struct rev_list_info {
        const char *header_prefix;
 };
 
-extern int show_bisect_vars(struct rev_list_info *info, int reaches, int all);
-
 extern int bisect_next_all(const char *prefix);
 
 extern int estimate_bisect_steps(int all);