diff options
Diffstat (limited to 'src/merge.c')
| -rw-r--r-- | src/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/merge.c b/src/merge.c index a279d31d4..beb6c8f9c 100644 --- a/src/merge.c +++ b/src/merge.c @@ -2572,7 +2572,7 @@ static int merge_preference(git_merge_preference_t *out, git_repository *repo) *out = GIT_MERGE_PREFERENCE_NONE; - if ((error = git_repository_config_snapshot(&config, repo)) < 0) + if ((error = git_repository_config(&config, repo)) < 0) goto done; if ((error = git_config_get_string(&value, config, "merge.ff")) < 0) { |