Merge branch 'tb/dedup-crlf-tests' into maint

* tb/dedup-crlf-tests:
t0027: tests are not expensive; remove t0025

diff --combined t/t0027-auto-crlf.sh
index 81609af7bbdf2f0ec0e16b4b7374dfc20a96001f,effc3db0d580e7c18c6c52585fb681a3001ff66b..deb3ae7813052d01b6dab92586e2c37d313ef8ff
--- 1/t/t0027-auto-crlf.sh
--- 2/t/t0027-auto-crlf.sh
+++ b/t/t0027-auto-crlf.sh
@@@ -4,12 -4,6 +4,6 @@@ test_description='CRLF conversion all c
  
  . ./test-lib.sh
  
- if ! test_have_prereq EXPENSIVE
- then
-       skip_all="EXPENSIVE not set"
-       test_done
- fi
- 
  compare_files () {
        tr '\015\000' QN <"$1" >"$1".expect &&
        tr '\015\000' QN <"$2" | tr -d 'Z' >"$2".actual &&
@@@ -75,7 -69,7 +69,7 @@@ check_warning () 
        *) echo >&2 "Illegal 1": "$1" ; return false ;;
        esac
        grep "will be replaced by" "$2" | sed -e "s/\(.*\) in [^ ]*$/\1/" | uniq  >"$2".actual
 -      test_cmp "$2".expect "$2".actual
 +      test_i18ncmp "$2".expect "$2".actual
  }
  
  commit_check_warn () {