### Fixed

- Fixed a bug that caused wrong event bindings and flag inversion (#727)
  - This caused following issues:
    - In some cases, settings changes were not applied or saved correctly.
    - Automatic synchronisation did not begin correctly.

### Improved
- Too large diffs are not shown in the file comparison view, due to performance reasons.

src/modules/features/InteractiveConflictResolving/ConflictResolveModal.ts

@@ -85,17 +85,15 @@ export class ConflictResolveModal extends Modal {
             }
         }
 
-        diff = diff.replace(/\n/g, "<br>");
-        div.innerHTML = diff;
         const div2 = contentEl.createDiv("");
         const date1 =
             new Date(this.result.left.mtime).toLocaleString() + (this.result.left.deleted ? " (Deleted)" : "");
         const date2 =
             new Date(this.result.right.mtime).toLocaleString() + (this.result.right.deleted ? " (Deleted)" : "");
-        div2.innerHTML = `
+        div2.setHTMLUnsafe(`
 <span class='deleted'><span class='conflict-dev-name'>${this.localName}</span>: ${date1}</span><br>
 <span class='added'><span class='conflict-dev-name'>${this.remoteName}</span>: ${date2}</span><br>
-        `;
+        `);
         contentEl.createEl("button", { text: `Use ${this.localName}` }, (e) =>
             e.addEventListener("click", () => this.sendResponse(this.result.right.rev))
         ).style.marginRight = "4px";
@@ -110,6 +108,13 @@ export class ConflictResolveModal extends Modal {
         contentEl.createEl("button", { text: !this.pluginPickMode ? "Not now" : "Cancel" }, (e) =>
             e.addEventListener("click", () => this.sendResponse(CANCELLED))
         ).style.marginRight = "4px";
+        diff = diff.replace(/\n/g, "<br>");
+        // div.innerHTML = diff;
+        if (diff.length > 100 * 1024) {
+            div.setText("(Too large diff to display)");
+        } else {
+            div.setHTMLUnsafe(diff);
+        }
     }
 
     sendResponse(result: MergeDialogResult) {