diff options
Diffstat (limited to 't/t6418-merge-text-auto.sh')
| -rwxr-xr-x | t/t6418-merge-text-auto.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/t/t6418-merge-text-auto.sh b/t/t6418-merge-text-auto.sh index 30983d18b1..91b43de00d 100755 --- a/t/t6418-merge-text-auto.sh +++ b/t/t6418-merge-text-auto.sh @@ -12,6 +12,9 @@ test_description='CRLF merge conflict across text=auto change *+ [side^] Initial ' +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME + . ./test-lib.sh test_have_prereq SED_STRIPS_CR && SED_OPTIONS=-b |