Merge branch 'ab/rebase-in-c-escape-hatch'

diff --git a/t/t6024-recursive-merge.sh b/t/t6024-recursive-merge.sh
index 3f59e58dfb5171d2e5ef53399c2f8d24fff1e94e..27c7de90ce64aa17594ca8cd43d87e35534aeb01 100755 (executable)
--- 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