From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 1 Dec 2016 18:34:42 +0000 (-0800)
Subject: Merge branch 'tb/t0027-raciness-fix' into jc/renormalize-merge-kill-safer-crlf
X-Git-Tag: v2.11.1~56^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b365dafe2360c12353259432a2940c6123cd2b52?hp=--cc

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`
---

b365dafe2360c12353259432a2940c6123cd2b52