From 78ee7e81f59dc1e51551628f8f90ee58ea286cf8 Mon Sep 17 00:00:00 2001
From: Ben Straub <bs@github.com>
Date: Wed, 5 Feb 2014 14:10:19 -0800
Subject: [PATCH] More merge.conflictstyle fixes

---
 tests/revert/workdir.c | 7 +++++++
 1 file changed, 7 insertions(+)

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)