- print >> sys.stderr, 'Error: Unhandled merge conflict: ' \
- '"%s" "%s" "%s" "%s" "%s" "%s" "%s"' \
- % (orig_hash, file1_hash, file2_hash,
- path,
- orig_mode, file1_mode, file2_mode)
+ out.error('Unhandled merge conflict: "%s" "%s" "%s" "%s" "%s" "%s" "%s"'
+ % (orig_hash, file1_hash, file2_hash,
+ path,
+ orig_mode, file1_mode, file2_mode))