TortoiseMerge uses wrong EOL with patches
By git... on November 20, 2013 05:41 (imported from Google Code)
What steps will reproduce the problem?
- Get a patch serial made on a linux box
- Review patch on windows
- When you apply parts of the patch, it uses mixed type EOL
What is the expected output? What do you see instead?
It should use the same EOL character the base file is in, not have both LF & CRLF line endings
What version of TortoiseGit and msysgit are you using? On
what operating system?
git version 1.8.4.msysgit.0
Please provide any additional information below.
Patch file is LF, base file is CRLF (windows)
When review patch, as can be seen by the picture, patch file is ALL LF.
Original file is ALL CRLF (windows)
If we use the patch's data, then it gets the file to have both LF and CRLF, and that is bad.
To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information