diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-10-30 13:07:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-30 13:07:06 -0700 |
| commit | f60b5dc68cdb7a75e148c5b98238a880363cf870 (patch) | |
| tree | ea3c683a7187722c009642715a9650deed7e4575 /t/t7600-merge.sh | |
| parent | 7fd4181c661260f10bf8cb3e80489c230205d774 (diff) | |
| parent | 39743cf554caaed462464b55315ab5b37f5ab1b9 (diff) | |
| download | git-f60b5dc68cdb7a75e148c5b98238a880363cf870.tar.gz | |
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
Diffstat (limited to 't/t7600-merge.sh')
0 files changed, 0 insertions, 0 deletions