From a95fb47af12f4f06df3284d2af6ce2f81c288a5d Mon Sep 17 00:00:00 2001
From: Roman Zhuravlov <SnelsiThePirate@gmail.com>
Date: Tue, 4 Feb 2025 03:10:31 +0200
Subject: [PATCH] fix: Pass diffConfig to options in CodeMirrorMerge component
 (#712)

---
 merge/src/Internal.tsx | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/merge/src/Internal.tsx b/merge/src/Internal.tsx
index ce75a6400..9adaeb37e 100644
--- a/merge/src/Internal.tsx
+++ b/merge/src/Internal.tsx
@@ -24,12 +24,21 @@ export const Internal = React.forwardRef<InternalRef, CodeMirrorMergeProps>((pro
     collapseUnchanged,
     destroyRerender = true,
     renderRevertControl,
+    diffConfig,
     ...elmProps
   } = props;
   const { modified, modifiedExtension, original, originalExtension, theme, dispatch, ...otherStore } = useStore();
   const editor = useRef<HTMLDivElement>(null);
   const view = useRef<MergeView>();
-  const opts = { orientation, revertControls, highlightChanges, gutter, collapseUnchanged, renderRevertControl };
+  const opts = {
+    orientation,
+    revertControls,
+    highlightChanges,
+    gutter,
+    collapseUnchanged,
+    renderRevertControl,
+    diffConfig,
+  };
 
   useImperativeHandle(
     ref,