Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
t7501: add test of "commit --dry-run --short"
[gitweb.git]
/
t
/
t4121-apply-diffs.sh
diff --git
a/t/t4121-apply-diffs.sh
b/t/t4121-apply-diffs.sh
index aff551a1d787477eb2db34d96217f66ca03c435d..66368effd5c04ebeaeba30e30eaf9ba9d7cf262a 100755
(executable)
--- a/
t/t4121-apply-diffs.sh
+++ b/
t/t4121-apply-diffs.sh
@@
-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