tests: mark tests relying on the current default for `init.defaultBranch`

[thirdparty/git.git] / t / t6417-merge-ours-theirs.sh

diff --git a/t/t6417-merge-ours-theirs.sh b/t/t6417-merge-ours-theirs.sh
index 0aebc6c028e06c8d98600ecbe37c0b0989a89bd8..e7883f890a18de02632c667488cda37ad6cb8161 100755 (executable)
--- a/t/t6417-merge-ours-theirs.sh
+++ b/t/t6417-merge-ours-theirs.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='Merge-recursive ours and theirs variants'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '