branch -d: base the "already-merged" safety on the branch it merges with

diff --git a/wt-status.h b/wt-status.h
index 09fd9f10919d109fdfbab491620be67e251124ea..c60f40a34a89ccdacdc864203d4441cf3e20bcc5 100644 (file)
--- a/wt-status.h
+++ b/wt-status.h
@@ -34,6 +34,7 @@ struct wt_status {
        const char **pathspec;
        int verbose;
        int amend;
+       int in_merge;
        int nowarn;
        int use_color;
        int relative_paths;
@@ -56,4 +57,7 @@ void wt_status_prepare(struct wt_status *s);
 void wt_status_print(struct wt_status *s);
 void wt_status_collect(struct wt_status *s);
 
+void wt_shortstatus_print(struct wt_status *s, int null_termination);
+void wt_porcelain_print(struct wt_status *s, int null_termination);
+
 #endif /* STATUS_H */