Merge branch 'en/merge-options-ff-and-friends'

diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
index a9054d2db11608d7ae2d407e9422a4f61c5e9afd..5ac94b390dfca31bcce585900c2c9b98b795309b 100755 (executable)
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@ -7,9 +7,6 @@ test_description='Various diff formatting options'
 
 . ./test-lib.sh
 
-LF='
-'
-
 test_expect_success setup '
 
        GIT_AUTHOR_DATE="2006-06-26 00:00:00 +0000" &&