Hi @Sainan,
Thanks for reaching out.
This was an intended change based on feedback that users were missing CRLFs accidentally being introduced into their repositories, as we were hiding them in cases where Git shows them. By default, Git will render carriage returns in diffs unless autocrlf is enabled, or the text/eol attribute has been set on a file.
There is currently a bug with the gitattributes
processing, where Sublime Merge is not enabling end-of-line normalization when the eol
attribute is set and the text attribute is not. We’re addressing this currently, and this will be resolved in the next build.
For the moment, you can either disable the carriage return rendering with:
- the git config option
git config core.whitespace cr-at-eol
(which will disable carriage return rendering in all diffs)
- Enabling the
text
attribute on the applicable file
- Enabling autocrlf
Kind regards,
- Dylan from Sublime HQ