Merge branch 'en/merge-ort-perf'

[thirdparty/git.git] / t / t6425-merge-rename-delete.sh

diff --git a/t/t6425-merge-rename-delete.sh b/t/t6425-merge-rename-delete.sh
index f79d021590215f63b5699d985c4e058b98bb03a7..459b431a60d83c9f1e7c052b9c41491854f9997d 100755 (executable)
--- a/t/t6425-merge-rename-delete.sh
+++ b/t/t6425-merge-rename-delete.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='Merge-recursive rename/delete conflict message'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'rename/delete' '
@@ -12,7 +15,7 @@ test_expect_success 'rename/delete' '
        git mv A B &&
        git commit -m "rename" &&
 
-       git checkout master &&
+       git checkout main &&
        git rm A &&
        git commit -m "delete" &&