Merge branch 'en/abort-df-conflict-fixes'

diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index 11e14a1e0fd591c053e3cb50a1a40e49b2b93e09..a6856e052b8f9e33a98a869d0b37c5977d93418f 100755 (executable)
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -872,7 +872,7 @@ test_expect_success 'remote prune to cause a dangling symref' '
                cd eight &&
                test_must_fail git branch nomore origin
        ) 2>err &&
-       grep "dangling symref" err
+       test_i18ngrep "dangling symref" err
 '
 
 test_expect_success 'show empty remote' '