summaryrefslogtreecommitdiff
path: root/t/t4066-diff-emit-delay.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/t4066-diff-emit-delay.sh')
-rwxr-xr-xt/t4066-diff-emit-delay.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4066-diff-emit-delay.sh b/t/t4066-diff-emit-delay.sh
index 1983f1e..a1de63b 100755
--- a/t/t4066-diff-emit-delay.sh
+++ b/t/t4066-diff-emit-delay.sh
@@ -1,7 +1,7 @@
#!/bin/sh
test_description='test combined/stat/moved interaction'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh
@@ -16,7 +16,7 @@ test_expect_success 'set up history with a merge' '
test_commit B &&
git checkout -b side HEAD^ &&
test_commit C &&
- git merge -m M master &&
+ git merge -m M main &&
test_commit D
'