Merge branch 'fc/rerere-conflict-style' into maint

diff --git a/wt-status.h b/wt-status.h
index b56ce3f0355f3a1e188c7d9bd44ea90f0d06d76f..283a9fef0335ce272c6799a5af17274e4798e15f 100644 (file)
--- a/wt-status.h
+++ b/wt-status.h
@@ -50,6 +50,7 @@ struct wt_status {
        enum commit_whence whence;
        int nowarn;
        int use_color;
+       int no_gettext;
        int display_comment_prefix;
        int relative_paths;
        int submodule_summary;