Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'mh/http-urlmatch-cleanup'
[gitweb.git]
/
t
/
t5515-fetch-merge-logic.sh
diff --git
a/t/t5515-fetch-merge-logic.sh
b/t/t5515-fetch-merge-logic.sh
index e55d8474efb6891d4bea9edf5488f793b26e135a..961eb35c99db6ba4d740f707cd17c7357a3aad0a 100755
(executable)
--- a/
t/t5515-fetch-merge-logic.sh
+++ b/
t/t5515-fetch-merge-logic.sh
@@
-12,9
+12,6
@@
GIT_TEST_PROTOCOL_VERSION=
. ./test-lib.sh
-LF='
-'
-
test_expect_success setup '
GIT_AUTHOR_DATE="2006-06-26 00:00:00 +0000" &&
GIT_COMMITTER_DATE="2006-06-26 00:00:00 +0000" &&