Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(272)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webkit/tools/merge/diff3-wrapper.py

Issue 20289: On Windows, find all modified files after a WebKit merge and force them... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | webkit/tools/merge/merge.py » ('j') | webkit/tools/merge/merge.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/tools/merge/diff3-wrapper.py
===================================================================
--- webkit/tools/merge/diff3-wrapper.py (revision 9626)
+++ webkit/tools/merge/diff3-wrapper.py (working copy)
@@ -108,9 +108,6 @@
# Return an errorcode of 0 on successful merge, 1 if unresolved conflicts
# remain in the result. Any other errorcode will be treated as fatal.
merged_file_contents = open(mine).read()
- # Ensure that the file doesn't use CRLF, in case the diff program converted
- # line endings.
- merged_file_contents.replace('\r\n', '\n')
# For reasons I don't understand, an extra line break gets added at the end
# of the file. Strip it.
« no previous file with comments | « no previous file | webkit/tools/merge/merge.py » ('j') | webkit/tools/merge/merge.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698