]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'tb/t0027-raciness-fix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Aug 2016 22:34:14 +0000 (15:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Aug 2016 22:34:14 +0000 (15:34 -0700)
commit643b62213e7da395354b578271f37711b6aed61b
tree2717fddbdc452d5b147c5e2ce8a9207f0a3d46d2
parentaeb1b7f55d5db4eda968de5eb27f04d42df9edc1
parenta0ad53c18100226cb1a138cb9b3bc3615170be8f
Merge branch 'tb/t0027-raciness-fix'

The t0027 test for CRLF conversion was timing dependent and flaky.

* tb/t0027-raciness-fix:
  convert: Correct NNO tests and missing `LF will be replaced by CRLF`