checkout -m path: fix recreating conflicts

diff --git a/t/t4113-apply-ending.sh b/t/t4113-apply-ending.sh
index d021ae84c3d64c8afe7ea563b78619ccd06214d7..66fa51591eb7ee8f102fd86e30e54af2da3ea310 100755 (executable)
--- a/t/t4113-apply-ending.sh
+++ b/t/t4113-apply-ending.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2006 Catalin Marinas
 #
 
-test_description='git-apply trying to add an ending line.
+test_description='git apply trying to add an ending line.
 
 '
 . ./test-lib.sh
@@ -25,11 +25,29 @@ echo 'b' >>file
 echo 'c' >>file
 
 test_expect_success setup \
-    'git-update-index --add file'
+    'git update-index --add file'
 
 # test
 
-test_expect_failure apply \
-    'git-apply --index test-patch'
+test_expect_success 'apply at the end' \
+    'test_must_fail git apply --index test-patch'
+
+cat >test-patch <<\EOF
+diff a/file b/file
+--- a/file
++++ b/file
+@@ -1,2 +1,3 @@
++a
+ b
+ c
+EOF
+
+echo >file 'a
+b
+c'
+git update-index file
+
+test_expect_success 'apply at the beginning' \
+       'test_must_fail git apply --index test-patch'
 
 test_done