Status: Available Owner: ---- CC: [email protected], [email protected], [email protected] Labels: Type-Bug Pri-2 OS-All Area-DevTools
New issue 6117 by [email protected]: merge script should ensure line endings are LF http://code.google.com/p/chromium/issues/detail?id=6117 Right now files that have a conflict it seems to use CRLF. This might be an issue with beyondcompare. In either case, the fix should be as simple as converting CRLF to LF after line 96 of src\webkit\tools\merge\diff3- wrapper.py. -- You received this message because you are listed in the owner or CC fields of this issue, or because you starred this issue. You may adjust your issue notification preferences at: http://code.google.com/hosting/settings --~--~---------~--~----~------------~-------~--~----~ Automated mail from issue updates at http://crbug.com/ Subscription options: http://groups.google.com/group/chromium-bugs -~----------~----~----~----~------~----~------~--~---
