Merge branch 'mergetool' of git://repo.or.cz/git/mergetool into maint

diff --git a/wt-status.h b/wt-status.h
index 75d3cfef9550f9bd109e1415c1678e036c04d7d5..cfea4ae68805d74b825cae6935a4a0dd5de5134d 100644 (file)
--- a/wt-status.h
+++ b/wt-status.h
@@ -12,9 +12,13 @@ struct wt_status {
        int is_initial;
        char *branch;
        const char *reference;
-       int commitable;
        int verbose;
        int amend;
+       int untracked;
+       /* These are computed during processing of the individual sections */
+       int commitable;
+       int workdir_dirty;
+       int workdir_untracked;
 };
 
 int git_status_config(const char *var, const char *value);