diff options
Diffstat (limited to 'tests/merge/files.c')
| -rw-r--r-- | tests/merge/files.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/merge/files.c b/tests/merge/files.c index c377471e2..adf4e02c2 100644 --- a/tests/merge/files.c +++ b/tests/merge/files.c @@ -22,7 +22,7 @@ void test_merge_files__initialize(void) git_repository_index(&repo_index, repo); /* Ensure that the user's merge.conflictstyle doesn't interfere */ - cl_git_pass(git_repository_config(&cfg, repo)); + cl_git_pass(git_repository_config_writable(&cfg, repo)); cl_git_pass(git_config_set_string(cfg, "merge.conflictstyle", "merge")); git_config_free(cfg); } |