Merge branch 'maint'

diff --git a/wt-status.h b/wt-status.h
index 682b4c8f7da2c58f741a958f6488a48fd7b483b4..6dd7207e25eb0292ba6630c9521c0eae719bb11d 100644 (file)
--- a/wt-status.h
+++ b/wt-status.h
@@ -56,6 +56,7 @@ struct wt_status {
        enum untracked_status_type show_untracked_files;
        const char *ignore_submodule_arg;
        char color_palette[WT_STATUS_MAXSLOT][COLOR_MAXLEN];
+       int colopts;
 
        /* These are computed during processing of the individual sections */
        int commitable;