mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-08-06 15:43:39 +02:00
Code Activity

diff3 -E is much easier to read

Browse Source
This commit is contained in:
Stephan Kulow
2010-03-05 11:45:35 +01:00
parent 0dcf378060
commit eb9f016338
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osc/commandline.py
View File

@@ -4754,7 +4754,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
continue
o = open(os.path.join(destdir, name), 'wb')
code = subprocess.call(['diff3', '-m',
code = subprocess.call(['diff3', '-m', '-E',
'-L', '.mine',
os.path.join(destdir, name + '.mine'),
'-L', '.old',
@@ -4873,7 +4873,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
continue
o = open(name, 'wb')
code = subprocess.call(['diff3', '-m',
code = subprocess.call(['diff3', '-m', '-E',
'-L', '.mine', name + '.mine',
'-L', '.old', name + '.old',
'-L', '.new', name + '.new',