Mirrors/notesnook
1
0
Fork 0
mirror of https://github.com/streetwriters/notesnook.git synced 2025-12-24 15:39:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

mobile: support showing diff of conflicted note

Browse Source
This commit is contained in:
Ammar Ahmed
2024-03-15 10:50:26 +05:00
committed by Abdullah Atta
parent eca9f221ac
commit d13ff079a4
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/mobile/app/components/merge-conflicts/index.js
View File

@@ -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
)
});
}}
/>