summaryrefslogtreecommitdiff
path: root/t/t6413-merge-crlf.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/t6413-merge-crlf.sh')
-rwxr-xr-xt/t6413-merge-crlf.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/t/t6413-merge-crlf.sh b/t/t6413-merge-crlf.sh
index e8d65eefb5..3bd8e3e899 100755
--- a/t/t6413-merge-crlf.sh
+++ b/t/t6413-merge-crlf.sh
@@ -8,6 +8,9 @@ test_description='merge conflict in crlf repo
'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success setup '