merge_recursive: Fix renames across paths below D/F conflicts

diff --git a/t/t4121-apply-diffs.sh b/t/t4121-apply-diffs.sh
index 2b2f1eda21c647c5c8aa0f0d2b41cecf8d90f6c4..aff551a1d787477eb2db34d96217f66ca03c435d 100755 (executable)
--- a/t/t4121-apply-diffs.sh
+++ b/t/t4121-apply-diffs.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-test_description='git-apply for contextually independent diffs'
+test_description='git apply for contextually independent diffs'
 . ./test-lib.sh
 
 echo '1
@@ -30,4 +30,3 @@ test_expect_success \
        '( git diff test~2 test~1; git diff test~1 test~0 )| git apply'
 
 test_done
-