diff options
Diffstat (limited to 'tests/merge/workdir/renames.c')
| -rw-r--r-- | tests/merge/workdir/renames.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/merge/workdir/renames.c b/tests/merge/workdir/renames.c index 807a88f4c..9cee4fee0 100644 --- a/tests/merge/workdir/renames.c +++ b/tests/merge/workdir/renames.c @@ -22,7 +22,7 @@ void test_merge_workdir_renames__initialize(void) repo = cl_git_sandbox_init(TEST_REPO_PATH); /* 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); } |