bug#29916: 26.0.90; CRLF in diff-command output breaks smerge hunk header parsing

[Richard Copley]

On 1 January 2018 at 23:23, Stefan Monnier <monnier@iro.umontreal.ca> wrote:
>> I suggest to use utf-8-emacs instead of emacs-mule (you _really_ don't
>> want the latter).  I do agree that forcing -unix EOL when decoding the
>> output of Diff is probably wrong.  Stefan?
>
> I guess utf-8-emacs would work as well, yes (I don't think the forcing
> of Unix EOL was intended when I changed emacs-mule into emacs-internal).

Thanks Stefan,

Eli, will you make the change please? I don't have write access and
I'm not ready to assign copyright. Sorry to be a bother! (Forget about
the patch I attached to the report. It wasn't meant to be a proposed
solution - it was for  a "data point" as I said.)