Merge branch 'maint'

diff --git a/t/t9129-git-svn-i18n-commitencoding.sh b/t/t9129-git-svn-i18n-commitencoding.sh
index 2848e46e38e1b664447e1ae8fc20d47c41e2acb5..938b7fe4b4027e2e74da6f816a43811cdf902204 100755 (executable)
--- a/t/t9129-git-svn-i18n-commitencoding.sh
+++ b/t/t9129-git-svn-i18n-commitencoding.sh
@@ -16,7 +16,7 @@ compare_git_head_with () {
 
 compare_svn_head_with () {
        LC_ALL=en_US.UTF-8 svn log --limit 1 `git svn info --url` | \
-               sed -e 1,3d -e "/^-\+\$/d" >current &&
+               sed -e 1,3d -e "/^-\{1,\}\$/d" >current &&
        test_cmp current "$1"
 }