t7501: add test of "commit --dry-run --short"
[gitweb.git] / t / t4121-apply-diffs.sh
index b95b89c341d3da9bb6f22c68cbb1144380396155..66368effd5c04ebeaeba30e30eaf9ba9d7cf262a 100755 (executable)
@@ -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
@@ -27,6 +27,6 @@ test_expect_success 'setup' \
 
 test_expect_success \
        'check if contextually independent diffs for the same file apply' \
-       '( git diff test~2 test~1; git diff test~1 test~0 )| git apply'
+       '( git diff test~2 test~1 && git diff test~1 test~0 )| git apply'
 
 test_done