Merge branch 'en/merge-recursive'

diff --git a/t/t2200-add-update.sh b/t/t2200-add-update.sh
index 2ad2819a345af53ff6ab0b7c28fa313f1a0a5956..856e7da1f2d3aba299d30aca9a1a6d5a288d2d91 100755 (executable)
--- a/t/t2200-add-update.sh
+++ b/t/t2200-add-update.sh
@@ -25,7 +25,7 @@ test_expect_success setup '
        echo initial >dir1/sub2 &&
        echo initial >dir2/sub3 &&
        git add check dir1 dir2 top foo &&
-       test_tick
+       test_tick &&
        git commit -m initial &&
 
        echo changed >check &&
@@ -111,7 +111,7 @@ test_expect_success 'touch and then add explicitly' '
 
 '
 
-test_expect_success 'add -n -u should not add but just report' '
+test_expect_success C_LOCALE_OUTPUT 'add -n -u should not add but just report' '
 
        (
                echo "add '\''check'\''" &&