proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-07-11 20:13:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

More merge.conflictstyle fixes

Browse Source
This commit is contained in:
Ben Straub 2014-02-05 14:10:19 -08:00
parent 3094102f69
commit 78ee7e81f5
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/revert/workdir.c
View File

@ -15,8 +15,15 @@ static git_index *repo_index;
// Fixture setup and teardown // Fixture setup and teardown
void test_revert_workdir__initialize(void) void test_revert_workdir__initialize(void)
{ {
git_config *cfg;
repo = cl_git_sandbox_init(TEST_REPO_PATH); repo = cl_git_sandbox_init(TEST_REPO_PATH);
git_repository_index(&repo_index, repo); 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) void test_revert_workdir__cleanup(void)