verify-merge.py : fix error in sys.stderr.write

5 years ago · 47e05f9288
parent 9c951d4771
commit 47e05f9288
1 changed files with 1 additions and 1 deletions
--- a/verify-merge.py
+++ b/verify-merge.py
@ -59,7 +59,7 @@ def verify():
                if 'sdk' in assert_file_contents[i]:
                    continue
                if assert_file_contents[i] != first_file_contents[i]:
-                    sys.stderr.write('ERROR: Found conflicting contents on line:', i)
+                    sys.stderr.write('ERROR: Found conflicting contents on line: ' + str(i) + ' of file ')
                    sys.stderr.write(assert_file + ':\n' + assert_file_contents[i])
                    sys.stderr.write(first_file + ':\n' + first_file_contents[i])
                    exit(1)