summaryrefslogtreecommitdiff
path: root/t/t6024-recursive-merge.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/t6024-recursive-merge.sh')
-rwxr-xr-xt/t6024-recursive-merge.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t6024-recursive-merge.sh b/t/t6024-recursive-merge.sh
index 3f59e58dfb..27c7de90ce 100755
--- a/t/t6024-recursive-merge.sh
+++ b/t/t6024-recursive-merge.sh
@@ -60,9 +60,9 @@ git update-index a1 &&
GIT_AUTHOR_DATE="2006-12-12 23:00:08" git commit -m F
'
-test_expect_success "combined merge conflicts" "
- test_must_fail git merge -m final G
-"
+test_expect_success 'combined merge conflicts' '
+ test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git merge -m final G
+'
cat > expect << EOF
<<<<<<< HEAD