3 ms·
Git is delegating to the diff to work out how to merge the blobs. It's the diff that is having trouble with the line endings.
by ajanuary 5y ago
Git is delegating to the diff to work out how to merge the blobs. It's the diff that is having trouble with the line endings.
- rileymat2 5y agoNo, in the past, git would change line endings. A check in on one machine and a check out on another machine would give different files.