1 files changed, 0 insertions, 44 deletions
diff --git a/third_party/git/t/t6033-merge-crlf.sh b/third_party/git/t/t6033-merge-crlf.sh
deleted file mode 100755
index e8d65eefb5..0000000000
--- a/third_party/git/t/t6033-merge-crlf.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-
-test_description='merge conflict in crlf repo
-
-		b---M
-	       /   /
-	initial---a
-
-'
-
-. ./test-lib.sh
-
-test_expect_success setup '
-	git config core.autocrlf true &&
-	echo foo | append_cr >file &&
-	git add file &&
-	git commit -m "Initial" &&
-	git tag initial &&
-	git branch side &&
-	echo line from a | append_cr >file &&
-	git commit -m "add line from a" file &&
-	git tag a &&
-	git checkout side &&
-	echo line from b | append_cr >file &&
-	git commit -m "add line from b" file &&
-	git tag b &&
-	git checkout master
-'
-
-test_expect_success 'Check "ours" is CRLF' '
-	git reset --hard initial &&
-	git merge side -s ours &&
-	cat file | remove_cr | append_cr >file.temp &&
-	test_cmp file file.temp
-'
-
-test_expect_success 'Check that conflict file is CRLF' '
-	git reset --hard a &&
-	test_must_fail git merge side &&
-	cat file | remove_cr | append_cr >file.temp &&
-	test_cmp file file.temp
-'
-
-test_done