Details
-
Bug
-
Resolution: Cannot Reproduce
-
Medium
Description
When trying to compare between 2 branches, if the branches contain files which have mixed CRLF (Windows) and LF (Unix) line endings, instead of showing the diff in the compare page, the page errors out instead. The different line endings seems to be confusing git when generating the diff and this throws out the error page. This looks to be a git bug which should be fixed on git 2.10.
Example repo of where this issue is reproduced: Link
Workaround:
Make the line endings consistent in the affected files on the branches and push an update into the branches. Once that happens the diff (and merge) should work.