Merge branch 'js/win32-mmap'

diff --git a/commit.h b/commit.h
index 5d58be0017a8eb26cd3f58c1e3b0b610f684beba..b06db4d5d9004e329a2a04de3d9af71a3578ef9d 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -147,6 +147,7 @@ struct pretty_print_context {
        int preserve_subject;
        struct date_mode date_mode;
        unsigned date_mode_explicit:1;
+       int expand_tabs_in_log;
        int need_8bit_cte;
        char *notes_message;
        struct reflog_walk_info *reflog_info;