diff options
| author | Eric Sunshine <sunshine@sunshineco.com> | 2018-07-02 03:24:00 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-17 00:38:47 +0300 |
| commit | f957f03b60163ffdc346cce44a67b0347a51190b (patch) | |
| tree | 75c88bf6b4a724a1c43b49d891e821e9d7d1f1e9 /t/t4121-apply-diffs.sh | |
| parent | b6c32f63f30ac5f469780c1d522af36d9a67d334 (diff) | |
t4000-t4999: fix broken &&-chains
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4121-apply-diffs.sh')
| -rwxr-xr-x | t/t4121-apply-diffs.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4121-apply-diffs.sh b/t/t4121-apply-diffs.sh index aff551a1d7..66368effd5 100755 --- 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 |