Make sure the empty tree exists when needed in merge-recursive.

diff --git a/wt-status.h b/wt-status.h
index 75d3cfef9550f9bd109e1415c1678e036c04d7d5..0a5a5b7ba9fc1d50c7dcab8220a4fb77ffecddb4 100644 (file)
--- a/wt-status.h
+++ b/wt-status.h
@@ -15,6 +15,7 @@ struct wt_status {
        int commitable;
        int verbose;
        int amend;
+       int untracked;
 };
 
 int git_status_config(const char *var, const char *value);