Merge branch 'mz/pull-rebase-rebased'

diff --git a/t/t4034-diff-words.sh b/t/t4034-diff-words.sh
index 3f3c7577ca85c92e5ff986044e0c4afa95bf608d..8096d8a337867b4afdc4b061fdc314fdd8eac185 100755 (executable)
--- a/t/t4034-diff-words.sh
+++ b/t/t4034-diff-words.sh
@@ -6,8 +6,8 @@ test_description='word diff colors'
 
 test_expect_success setup '
 
-       git config diff.color.old red
-       git config diff.color.new green
+       git config diff.color.old red &&
+       git config diff.color.new green &&
        git config diff.color.func magenta
 
 '