On Windows, find all modified files after a WebKit merge and force them...

webkit/tools/merge/diff3-wrapper.py

 #!/bin/env python
 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Wrapper around BeyondCompare or kdiff3 so it can be used as svn's diff3-cmd
 tool.
 
 The basic idea here is based heavily off of diffwrap.py at:
 http://svnbook.red-bean.com/en/1.5/svn.advanced.externaldifftools.html#svn.advanced.externaldifftools.diff3.ex-1
@@ skipping 90 matching lines @@
                                   shell=True)
   except Exception,e:
     print "Error running " + (" ".join(cmd))
     traceback.print_exc(file=sys.stdout)
 
   # After performing the merge, this script needs to print the contents
   # of the merged file to stdout. 
   # 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.
   merged_file_contents = merged_file_contents[:-1]
   print merged_file_contents
   return return_code
 
 if '__main__' == __name__:
   try:
     return_code = main(sys.argv)
   except Exception,e:
     traceback.print_exc(file=sys.stdout)
     # diff3 uses '1' to mean "conflict" and 2 to mean "I barfed".
     sys.exit(2) # return "I barfed"
   sys.exit(return_code)