Merge branch 'fc/rerere-conflict-style' into maint

diff --git a/wt-status.h b/wt-status.h
index 82f6ce64f8312f9d02e6dc08d46ec8af96a311a3..283a9fef0335ce272c6799a5af17274e4798e15f 100644 (file)
--- a/wt-status.h
+++ b/wt-status.h
@@ -93,6 +93,7 @@ struct wt_status_state {
 };
 
 void wt_status_truncate_message_at_cut_line(struct strbuf *);
+void wt_status_add_cut_line(FILE *fp);
 void wt_status_prepare(struct wt_status *s);
 void wt_status_print(struct wt_status *s);
 void wt_status_collect(struct wt_status *s);