t3407-rebase-abort.sh: Enhance existing tests, and add test for rebase --merge

diff --git a/t/t4118-apply-empty-context.sh b/t/t4118-apply-empty-context.sh
index dd88e81e04beaa0e0a703efa3e4130c474ef0b69..1d531caf798b9e8dfbe17714ad1eb09be14f7f93 100755 (executable)
--- a/t/t4118-apply-empty-context.sh
+++ b/t/t4118-apply-empty-context.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2006 Junio C Hamano
 #
 
-test_description='git-apply with new style GNU diff with empty context
+test_description='git apply with new style GNU diff with empty context
 
 '