Merge branch 'maint'

diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh
index f9eb67d8351e608ec213a330f63a94ac0d3b81be..fc2307eaa3b4e8b1481fd7aa5ae0f93d085338af 100755 (executable)
--- a/t/t4015-diff-whitespace.sh
+++ b/t/t4015-diff-whitespace.sh
@@ -352,4 +352,20 @@ test_expect_success 'checkdiff allows new blank lines' '
        git diff --check
 '
 
+test_expect_success 'combined diff with autocrlf conversion' '
+
+       git reset --hard &&
+       echo >x hello &&
+       git commit -m "one side" x &&
+       git checkout HEAD^ &&
+       echo >x goodbye &&
+       git commit -m "the other side" x &&
+       git config core.autocrlf true &&
+       test_must_fail git merge master &&
+
+       git diff | sed -e "1,/^@@@/d" >actual &&
+       ! grep "^-" actual
+
+'
+
 test_done