Merge branch 'md/sort-detached-head-first'

diff --git a/wt-status.h b/wt-status.h
index 3a95975032bb1ee8d87cca4e8a1bbc0afe62e42c..b0cfdc8011c3cf06db89f1fa19c9c2586fcfe4df 100644 (file)
--- a/wt-status.h
+++ b/wt-status.h
@@ -65,6 +65,9 @@ enum wt_status_format {
        STATUS_FORMAT_UNSPECIFIED
 };
 
+#define HEAD_DETACHED_AT _("HEAD detached at ")
+#define HEAD_DETACHED_FROM _("HEAD detached from ")
+
 struct wt_status_state {
        int merge_in_progress;
        int am_in_progress;
@@ -129,6 +132,7 @@ struct wt_status {
 };
 
 size_t wt_status_locate_end(const char *s, size_t len);
+void wt_status_append_cut_line(struct strbuf *buf);
 void wt_status_add_cut_line(FILE *fp);
 void wt_status_prepare(struct repository *r, struct wt_status *s);
 void wt_status_print(struct wt_status *s);