Merge branch 'tb/t0027-raciness-fix' into jc/renormalize-merge-kill-safer-crlf
commitb365dafe2360c12353259432a2940c6123cd2b52
authorJunio C Hamano <gitster@pobox.com>
Thu, 1 Dec 2016 18:34:42 +0000 (1 10:34 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 1 Dec 2016 18:34:42 +0000 (1 10:34 -0800)
tree3a44c43c393af77be58d0832fb07554ce08e9e8d
parent55e9f0e5c9a918c246b7eae1fe2a2e954f6426af
parenta0ad53c18100226cb1a138cb9b3bc3615170be8f
Merge branch 'tb/t0027-raciness-fix' into jc/renormalize-merge-kill-safer-crlf

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