int index_status;
int stagemask;
char *head_path;
+ unsigned dirty_submodule : 2;
+ unsigned new_submodule_commits : 1;
};
struct wt_status {
const char **pathspec;
int verbose;
int amend;
+ int in_merge;
int nowarn;
int use_color;
int relative_paths;