Merge branch 'tb/unicode-7.0-display-width'

diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
index 3d305814b9d755a827d27ed9036ebb2f8d48abe6..e00d7d2b6186023642bc9d0b5d5dd6a526278767 100755 (executable)
--- a/t/t3600-rm.sh
+++ b/t/t3600-rm.sh
@@ -711,8 +711,7 @@ test_expect_success 'checking out a commit after submodule removal needs manual
        git submodule update &&
        git checkout -q HEAD^ 2>actual &&
        git checkout -q master 2>actual &&
-       echo "warning: unable to rmdir submod: Directory not empty" >expected &&
-       test_i18ncmp expected actual &&
+       test_i18ngrep "^warning: unable to rmdir submod:" actual &&
        git status -s submod >actual &&
        echo "?? submod/" >expected &&
        test_cmp expected actual &&