From 22ab8881787f00eec479e1f148a3846a67c9bcfe Mon Sep 17 00:00:00 2001
From: Edward Thomson <ethomson@microsoft.com>
Date: Tue, 20 May 2014 22:07:15 -0700
Subject: [PATCH] Use a config snapshot

---
 src/merge.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/merge.c b/src/merge.c
index 02851e526..54c7660db 100644
--- a/src/merge.c
+++ b/src/merge.c
@@ -2572,7 +2572,7 @@ int merge_config(git_merge_config_t *out, git_repository *repo)
 
 	*out = GIT_MERGE_CONFIG_NONE;
 
-	if ((error = git_repository_config(&config, repo)) < 0)
+	if ((error = git_repository_config_snapshot(&config, repo)) < 0)
 		goto done;
 
 	if ((error = git_config_get_string(&value, config, "merge.ff")) < 0) {