Merge git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/t/t4104-apply-boundary.sh b/t/t4104-apply-boundary.sh
index a5fb3ea40e4fde9126e66ed46fd3fc337b40ff66..43943ab8ca181edbdcc6a68d208cf584b5cda86d 100755 (executable)
--- a/t/t4104-apply-boundary.sh
+++ b/t/t4104-apply-boundary.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2005 Junio C Hamano
 #
 
-test_description='git-apply boundary tests
+test_description='git apply boundary tests
 
 '
 . ./test-lib.sh
@@ -112,4 +112,17 @@ do
        '
 done
 
+test_expect_success 'two lines' '
+
+       >file &&
+       git add file &&
+       echo aaa >file &&
+       git diff >patch &&
+       git add file &&
+       echo bbb >file &&
+       git add file &&
+       test_must_fail git apply --check patch
+
+'
+
 test_done