Merge branch 'master' of git://repo.or.cz/git-gui

[git.git] / environment.c

diff --git a/environment.c b/environment.c
index 0bee6a7a88299f8c89eedeee25cece1d3cdafef0..2c41d7d6cb66832197d69d49065a3d5b3bb2e5da 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -9,6 +9,7 @@
  */
 #include "cache.h"
 #include "refs.h"
+#include "fmt-merge-msg.h"
 
 char git_default_email[MAX_GITNAME];
 char git_default_name[MAX_GITNAME];
@@ -59,6 +60,7 @@ enum object_creation_mode object_creation_mode = OBJECT_CREATION_MODE;
 char *notes_ref_name;
 int grafts_replace_parents = 1;
 int core_apply_sparse_checkout;
+int merge_log_config = -1;
 struct startup_info *startup_info;
 
 /* Parallel index stat data preload? */