diff options
Diffstat (limited to 't/t6425-merge-rename-delete.sh')
-rwxr-xr-x | t/t6425-merge-rename-delete.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t6425-merge-rename-delete.sh b/t/t6425-merge-rename-delete.sh index e58e3dfba1..459b431a60 100755 --- a/t/t6425-merge-rename-delete.sh +++ b/t/t6425-merge-rename-delete.sh @@ -1,7 +1,7 @@ #!/bin/sh test_description='Merge-recursive rename/delete conflict message' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh @@ -15,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" && |