Move make_cache_entry() from merge-recursive.c into read-cache.c

diff --git a/revision.h b/revision.h
index f46b4d55a2c75e201b37dda8edd6d353722a96cb..98a0a8f3fa9db4b2302dd31a4867ae824831b25c 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -81,6 +81,7 @@ struct rev_info {
        const char      *log_reencode;
        const char      *subject_prefix;
        int             no_inline;
+       int             show_log_size;
 
        /* Filter by commit log message */
        struct grep_opt *grep_filter;