Fix line endings merging issue

By lpapp.b... on April 07, 2010 13:02 (imported from Google Code)

---

1. Do a fresh pull operation on Linux client
2. Do a fresh pull operation on Windows client with TortoiseGIT
3. Modify a file in that repository on Linux
4. Commit that change on Linux
5. Pull that change on Linux
6. Change the same file on Windows
7. Commit this change on windows with TortoiseGIT
8. Try to pull on windows client with TortoiseGIT from the remote repository
9. You will experience a merge conflict, try to solve it from mine e.g.
10. Click for the Resolved in the menu, and you will get a fatal error
    popup window about the CR+LF line endings.

The CRLF settings are on windows:
- Checked AutoCRLF
- Checked SafeCRLF