Merge branch 'jk/utf8-switch-between-nfd-and-nfc'

diff --git a/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh b/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh
index 37021e200a32d36e37f5c0ca7f6cacdca7d80187..6b0dbdac4d355cb1a2c952977be2b3cf84aa17a7 100755 (executable)
--- a/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh
+++ b/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh
@@ -70,8 +70,8 @@ test_expect_success 'The shallow option works with accents' '
        test_path_is_file mw_dir_4/Main_Page.mw &&
        (
                cd mw_dir_4 &&
-               test `git log --oneline Néoà.mw | wc -l` -eq 1 &&
-               test `git log --oneline Main_Page.mw | wc -l ` -eq 1
+               test $(git log --oneline Néoà.mw | wc -l) -eq 1 &&
+               test $(git log --oneline Main_Page.mw | wc -l ) -eq 1
        ) &&
        wiki_check_content mw_dir_4/Néoà.mw Néoà &&
        wiki_check_content mw_dir_4/Main_Page.mw Main_Page