diff options
Diffstat (limited to 'wt-status.h')
-rw-r--r-- | wt-status.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/wt-status.h b/wt-status.h index a4bddcf8db..c60f40a34a 100644 --- 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; |