diff options
Diffstat (limited to 'tests/checkout/conflict.c')
| -rw-r--r-- | tests/checkout/conflict.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/checkout/conflict.c b/tests/checkout/conflict.c index 2cb7c224d..5f1ddb3f6 100644 --- a/tests/checkout/conflict.c +++ b/tests/checkout/conflict.c @@ -71,7 +71,7 @@ void test_checkout_conflict__initialize(void) "* text eol=lf\n"); /* Ensure that the user's merge.conflictstyle doesn't interfere */ - cl_git_pass(git_repository_config(&cfg, g_repo)); + cl_git_pass(git_repository_config_writable(&cfg, g_repo)); cl_git_pass(git_config_set_string(cfg, "merge.conflictstyle", "merge")); git_config_free(cfg); } |