diff options
Diffstat (limited to 't/t6413-merge-crlf.sh')
| -rwxr-xr-x | t/t6413-merge-crlf.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t6413-merge-crlf.sh b/t/t6413-merge-crlf.sh index 3bd8e3e899..affea255fe 100755 --- a/t/t6413-merge-crlf.sh +++ b/t/t6413-merge-crlf.sh @@ -8,7 +8,7 @@ test_description='merge conflict in crlf repo ' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh @@ -27,7 +27,7 @@ test_expect_success setup ' echo line from b | append_cr >file && git commit -m "add line from b" file && git tag b && - git checkout master + git checkout main ' test_expect_success 'Check "ours" is CRLF' ' |