Merge branch 'bc/attr-ignore-case' into maint

diff --git a/t/t1200-tutorial.sh b/t/t1200-tutorial.sh
index ab55eda158bb5a6ecad77302aa2fe17bd6e92be3..5e29e13782ffad74915128adf163d57eef16f4e8 100755 (executable)
--- a/t/t1200-tutorial.sh
+++ b/t/t1200-tutorial.sh
@@ -42,7 +42,7 @@ test_expect_success 'git diff' '
 '
 
 test_expect_success 'tree' '
-       tree=$(git write-tree 2>/dev/null)
+       tree=$(git write-tree 2>/dev/null) &&
        test 8988da15d077d4829fc51d8544c097def6644dbb = $tree
 '
 
@@ -163,8 +163,11 @@ test_expect_success 'git resolve' '
        git checkout mybranch &&
        git merge -m "Merge upstream changes." master |
                sed -e "1s/[0-9a-f]\{7\}/VARIABLE/g" \
-               -e "s/^Fast[- ]forward /FASTFORWARD /" >resolve.output &&
-       test_cmp resolve.expect resolve.output
+               -e "s/^Fast[- ]forward /FASTFORWARD /" >resolve.output
+'
+
+test_expect_success 'git resolve output' '
+       test_i18ncmp resolve.expect resolve.output
 '
 
 cat > show-branch2.expect << EOF