From d13ff079a4da3eebe5f87dbd162cfc7fdfc754cb Mon Sep 17 00:00:00 2001
From: Ammar Ahmed <ammarahmed6506@gmail.com>
Date: Fri, 15 Mar 2024 10:50:26 +0500
Subject: [PATCH] mobile: support showing diff of conflicted note

---
 apps/mobile/app/components/merge-conflicts/index.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/mobile/app/components/merge-conflicts/index.js b/apps/mobile/app/components/merge-conflicts/index.js
index 8c021b103..f26a39a23 100644
--- a/apps/mobile/app/components/merge-conflicts/index.js
+++ b/apps/mobile/app/components/merge-conflicts/index.js
@@ -47,6 +47,7 @@ import { Button } from "../ui/button";
 import { IconButton } from "../ui/icon-button";
 import Seperator from "../ui/seperator";
 import Paragraph from "../ui/typography/paragraph";
+import { diff } from "diffblazer";
 
 const MergeConflicts = () => {
   const { colors } = useThemeColors();
@@ -322,7 +323,10 @@ const MergeConflicts = () => {
                 if (!note) return;
                 loadContent({
                   id: note.id,
-                  data: content.current.data
+                  data: diff(
+                    content.current.conflicted.data,
+                    content.current.data
+                  )
                 });
               }}
             />