Merge branch 'js/rebase-merges-exec-fix'

diff --git a/t/t9806-git-p4-options.sh b/t/t9806-git-p4-options.sh
index 1ab76c4246f215cfc0082bdbfd090e1622362140..3f5291b85752e7bc78901da18c2bfa654134eb59 100755 (executable)
--- a/t/t9806-git-p4-options.sh
+++ b/t/t9806-git-p4-options.sh
@@ -134,7 +134,7 @@ test_expect_success 'clone --changesfile' '
        (
                cd "$git" &&
                git log --oneline p4/master >lines &&
-               test_line_count = 2 lines
+               test_line_count = 2 lines &&
                test_path_is_file file1 &&
                test_path_is_missing file2 &&
                test_path_is_file file3