From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 6 Jun 2016 21:27:36 +0000 (-0700)
Subject: Merge branch 'tb/core-eol-fix' into maint
X-Git-Tag: v2.8.4~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7dcbf891d975eba5b1e3095cb3b389834689ac09?ds=sidebyside;hp=--cc

Merge branch 'tb/core-eol-fix' into maint

A couple of bugs around core.autocrlf have been fixed.

* tb/core-eol-fix:
convert.c: ident + core.autocrlf didn't work
t0027: test cases for combined attributes
convert: allow core.autocrlf=input and core.eol=crlf
t0027: make commit_chk_wrnNNO() reliable
---

7dcbf891d975eba5b1e3095cb3b389834689ac09