Imported Upstream version 2.25.4

[platform/upstream/git.git] / t / t5515-fetch-merge-logic.sh

diff --git a/t/t5515-fetch-merge-logic.sh b/t/t5515-fetch-merge-logic.sh
index 36b0dbc..961eb35 100755 (executable)
--- a/t/t5515-fetch-merge-logic.sh
+++ b/t/t5515-fetch-merge-logic.sh
@@ -6,10 +6,11 @@
 
 test_description='Merge logic in fetch'
 
-. ./test-lib.sh
+# NEEDSWORK: If the overspecification of the expected result is reduced, we
+# might be able to run this test in all protocol versions.
+GIT_TEST_PROTOCOL_VERSION=
 
-LF='
-'
+. ./test-lib.sh
 
 test_expect_success setup '
        GIT_AUTHOR_DATE="2006-06-26 00:00:00 +0000" &&