diff options
| author | Ben Straub <bs@github.com> | 2014-02-06 02:10:19 +0400 |
|---|---|---|
| committer | Ben Straub <bs@github.com> | 2014-02-06 02:10:19 +0400 |
| commit | 78ee7e81f59dc1e51551628f8f90ee58ea286cf8 (patch) | |
| tree | 47acb689571e989258c354aeba3dcdcaadd41a31 /tests/revert | |
| parent | 3094102f694cc7bdbe3572a35050fec3729b2870 (diff) | |
More merge.conflictstyle fixes
Diffstat (limited to 'tests/revert')
| -rw-r--r-- | tests/revert/workdir.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/revert/workdir.c b/tests/revert/workdir.c index f2a0b6bcb..47abeb8f0 100644 --- a/tests/revert/workdir.c +++ b/tests/revert/workdir.c @@ -15,8 +15,15 @@ static git_index *repo_index; // Fixture setup and teardown void test_revert_workdir__initialize(void) { + git_config *cfg; + repo = cl_git_sandbox_init(TEST_REPO_PATH); 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_config_set_string(cfg, "merge.conflictstyle", "merge")); + git_config_free(cfg); } void test_revert_workdir__cleanup(void) |