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

diff --git a/t/t4109-apply-multifrag.sh b/t/t4109-apply-multifrag.sh
old mode 100644 (file)
new mode 100755 (executable)
index 5988e1a..bd40a21
--- a/t/t4109-apply-multifrag.sh
+++ b/t/t4109-apply-multifrag.sh
@@ -4,7 +4,7 @@
 # Copyright (c) 2005 Robert Fitzsimons
 #
 
-test_description='git-apply test patches with multiple fragments.
+test_description='git apply test patches with multiple fragments.
 
 '
 . ./test-lib.sh
@@ -138,8 +138,8 @@ diff --git a/main.c b/main.c
  
 EOF
 
-test_expect_success "S = git-apply (1)" \
-    'git-apply patch1.patch patch2.patch'
+test_expect_success "S = git apply (1)" \
+    'git apply patch1.patch patch2.patch'
 mv main.c main.c.git
 
 test_expect_success "S = patch (1)" \
@@ -150,8 +150,8 @@ test_expect_success "S = cmp (1)" \
 
 rm -f main.c main.c.git
 
-test_expect_success "S = git-apply (2)" \
-    'git-apply patch1.patch patch2.patch patch3.patch'
+test_expect_success "S = git apply (2)" \
+    'git apply patch1.patch patch2.patch patch3.patch'
 mv main.c main.c.git
 
 test_expect_success "S = patch (2)" \
@@ -162,8 +162,8 @@ test_expect_success "S = cmp (2)" \
 
 rm -f main.c main.c.git
 
-test_expect_success "S = git-apply (3)" \
-    'git-apply patch1.patch patch4.patch'
+test_expect_success "S = git apply (3)" \
+    'git apply patch1.patch patch4.patch'
 mv main.c main.c.git
 
 test_expect_success "S = patch (3)" \