summaryrefslogtreecommitdiff
path: root/t/t4056-diff-order.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/t4056-diff-order.sh')
-rwxr-xr-xt/t4056-diff-order.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4056-diff-order.sh b/t/t4056-diff-order.sh
index 723eee4..63ea714 100755
--- a/t/t4056-diff-order.sh
+++ b/t/t4056-diff-order.sh
@@ -2,7 +2,7 @@
test_description='diff order'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh
@@ -109,7 +109,7 @@ done
test_expect_success 'setup for testing combine-diff order' '
git checkout -b tmp HEAD~ &&
create_files 3 &&
- git checkout master &&
+ git checkout main &&
git merge --no-commit -s ours tmp &&
create_files 5
'