Merge remote-tracking branch 'origin/tr/patch_bug' into tr/patch_bug

This commit is contained in:
mrT23 2025-01-04 16:30:47 +02:00
commit 5adc246040
No known key found for this signature in database
GPG key ID: D350490E39D5F5AD

View file

@ -588,8 +588,8 @@ def load_large_diff(filename, new_file_content_str: str, original_file_content_s
return "" return ""
try: try:
original_file_content_str = original_file_content_str.rstrip() + "\n" original_file_content_str = (original_file_content_str or "").rstrip() + "\n"
new_file_content_str = new_file_content_str.rstrip() + "\n" new_file_content_str = (new_file_content_str or "").rstrip() + "\n"
diff = difflib.unified_diff(original_file_content_str.splitlines(keepends=True), diff = difflib.unified_diff(original_file_content_str.splitlines(keepends=True),
new_file_content_str.splitlines(keepends=True)) new_file_content_str.splitlines(keepends=True))
if get_settings().config.verbosity_level >= 2 and show_warning: if get_settings().config.verbosity_level >= 2 and show_warning: