diff options
Diffstat (limited to 't/t6400-merge-df.sh')
| -rwxr-xr-x | t/t6400-merge-df.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/t/t6400-merge-df.sh b/t/t6400-merge-df.sh index 9da0838216..5fab2d2dd7 100755 --- a/t/t6400-merge-df.sh +++ b/t/t6400-merge-df.sh @@ -4,6 +4,9 @@ # test_description='Test merge with directory/file conflicts' +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME + . ./test-lib.sh test_expect_success 'prepare repository' ' |