diff options
| author | pamg@google.com <pamg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-12 13:36:19 +0000 |
|---|---|---|
| committer | pamg@google.com <pamg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-12 13:36:19 +0000 |
| commit | 212b30d4e8c264d565fedadb3c1bb8c649779299 (patch) | |
| tree | bf5c0eb7109b12d768f463114e8568ebd7b19a9e /webkit/tools/merge/diff3-wrapper.py | |
| parent | 6cc67d7fdd6a666109bb82b411905c0f3415dce3 (diff) | |
| download | chromium_src-212b30d4e8c264d565fedadb3c1bb8c649779299.zip chromium_src-212b30d4e8c264d565fedadb3c1bb8c649779299.tar.gz chromium_src-212b30d4e8c264d565fedadb3c1bb8c649779299.tar.bz2 | |
On Windows, find all modified files after a WebKit merge and force them
to LF. 'svn merge' saves them with CRLF otherwise, which interferes with
later merges.
Remove the now-obsolete code that did the same thing after a 3-way merge,
which only took effect when a file had conflicts.
BUG=7536
TEST=run a merge, see no CRLF in text files
Review URL: http://codereview.chromium.org/20289
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9650 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/merge/diff3-wrapper.py')
| -rwxr-xr-x | webkit/tools/merge/diff3-wrapper.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/webkit/tools/merge/diff3-wrapper.py b/webkit/tools/merge/diff3-wrapper.py index 96e0a74..aa1de4a 100755 --- a/webkit/tools/merge/diff3-wrapper.py +++ b/webkit/tools/merge/diff3-wrapper.py @@ -108,9 +108,6 @@ def main(args): # 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. |