unpack-trees: do not fail reset because of unmerged skipped entry

diff --git a/wt-status.h b/wt-status.h
index 430770b854c41b38b95dae6e8fa8943629a2309b..1673d146fa2f1e15eabccd1c6b12d0e74b5f0870 100644 (file)
--- a/wt-status.h
+++ b/wt-status.h
@@ -89,7 +89,9 @@ struct wt_status {
        int show_stash;
        int hints;
        enum ahead_behind_flags ahead_behind_flags;
-
+       int detect_rename;
+       int rename_score;
+       int rename_limit;
        enum wt_status_format status_format;
        unsigned char sha1_commit[GIT_MAX_RAWSZ]; /* when not Initial */