]> git.ipfire.org Git - thirdparty/git.git/blobdiff - t/t3508-cherry-pick-many-commits.sh
Merge branch 'ab/detox-gettext-tests'
[thirdparty/git.git] / t / t3508-cherry-pick-many-commits.sh
index ec7a2c9fcfa2f2636c428ed78b12050cfa733d46..e8375d1c970e3313302a2580d742f1e88732070c 100755 (executable)
@@ -86,7 +86,7 @@ test_expect_success 'output to keep user entertained during multi-pick' '
        git cherry-pick first..fourth >actual &&
        sed -e "s/$_x05[0-9a-f][0-9a-f]/OBJID/" <actual >actual.fuzzy &&
        test_line_count -ge 3 actual.fuzzy &&
-       test_i18ncmp expected actual.fuzzy
+       test_cmp expected actual.fuzzy
 '
 
 test_expect_success 'cherry-pick --strategy resolve first..fourth works' '
@@ -123,7 +123,7 @@ test_expect_success 'output during multi-pick indicates merge strategy' '
        test_tick &&
        git cherry-pick --strategy resolve first..fourth >actual &&
        sed -e "s/$_x05[0-9a-f][0-9a-f]/OBJID/" <actual >actual.fuzzy &&
-       test_i18ncmp expected actual.fuzzy
+       test_cmp expected actual.fuzzy
 '
 
 test_expect_success 'cherry-pick --ff first..fourth works' '