merge-recursive: Fix modify/delete resolution in the recursive case

diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index 3e7baaf89f9bada46fc084e568544ce9df833594..2ac1c66079b7656a60a25fbbb91c48c0b1db010b 100755 (executable)
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -1120,12 +1120,11 @@ test_expect_success \
        ! (GIT_EDITOR=cat git tag -a initial-comment > actual)
 '
 
-test_expect_success \
-       'message in editor has initial comment: first line' '
+test_expect_success 'message in editor has initial comment: first line' '
        # check the first line --- should be empty
        echo >first.expect &&
        sed -e 1q <actual >first.actual &&
-       test_cmp first.expect first.actual
+       test_i18ncmp first.expect first.actual
 '
 
 test_expect_success \