From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 30 Oct 2015 20:07:06 +0000 (-0700)
Subject: Merge branch 'gr/rebase-i-drop-warn'
X-Git-Tag: v2.7.0-rc0~52
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f60b5dc68cdb7a75e148c5b98238a880363cf870?ds=inline;hp=--cc

Merge branch 'gr/rebase-i-drop-warn'

Recent update to "rebase -i" that tries to sanity check the edited
insn sheet before it uses it has become too picky on Windows where
CRLF left by the editor is turned into a trailing CR on the line
read via the "read" built-in command.

* gr/rebase-i-drop-warn:
rebase-i: work around Windows CRLF line endings
t3404: "rebase -i" gets broken when insn sheet uses CR/LF line endings
---

f60b5dc68cdb7a75e148c5b98238a880363cf870