| OLD | NEW |
|---|
| 1 #!/bin/env python | 1 #!/bin/env python |
| 2 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 2 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 """Wrapper around BeyondCompare or kdiff3 so it can be used as svn's diff3-cmd | 6 """Wrapper around BeyondCompare or kdiff3 so it can be used as svn's diff3-cmd |
| 7 tool. | 7 tool. |
| 8 | 8 |
| 9 The basic idea here is based heavily off of diffwrap.py at: | 9 The basic idea here is based heavily off of diffwrap.py at: |
| 10 http://svnbook.red-bean.com/en/1.5/svn.advanced.externaldifftools.html#svn.advan
ced.externaldifftools.diff3.ex-1 | 10 http://svnbook.red-bean.com/en/1.5/svn.advanced.externaldifftools.html#svn.advan
ced.externaldifftools.diff3.ex-1 |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 merged_file_contents.replace('\r\n', '\n') | 101 merged_file_contents.replace('\r\n', '\n') |
| 102 | 102 |
| 103 # For reasons I don't understand, an extra line break gets added at the end | 103 # For reasons I don't understand, an extra line break gets added at the end |
| 104 # of the file. Strip it. | 104 # of the file. Strip it. |
| 105 merged_file_contents = merged_file_contents[:-1] | 105 merged_file_contents = merged_file_contents[:-1] |
| 106 print merged_file_contents | 106 print merged_file_contents |
| 107 sys.exit(value) | 107 sys.exit(value) |
| 108 | 108 |
| 109 if '__main__' == __name__: | 109 if '__main__' == __name__: |
| 110 main(sys.argv) | 110 main(sys.argv) |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 18557:
Set the svn eol-style to LF for merge scripts. (Closed)
Base URL: svn://chrome-svn/chrome/trunk/src/