Merge branch 'ja/l10n-fixes'

diff --git a/t/t6010-merge-base.sh b/t/t6010-merge-base.sh
index aa2d360ce35940a176a0ef04ca7ba8560adefb23..44c726ea397cf10a2c522690653ecb696f96cc8b 100755 (executable)
--- a/t/t6010-merge-base.sh
+++ b/t/t6010-merge-base.sh
@@ -245,7 +245,7 @@ test_expect_success 'using reflog to find the fork point' '
                        git commit --allow-empty -m "Derived #$count" &&
                        git rev-parse HEAD >derived$count &&
                        git checkout -B base $E || exit 1
-               done
+               done &&
 
                for count in 1 2 3
                do