fmt-merge-msg: use branch.$name.description

[thirdparty/git.git] / environment.c

diff --git a/environment.c b/environment.c
index e96edcfebc4174a5166c11e7a511ea792e7a2639..ba9781b7133b0eea7375b550898426ed75e9c387 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -58,6 +58,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? */