From 3ac242978ddc42e02c2ee569d6da72076a4028eb Mon Sep 17 00:00:00 2001
From: Austin Fulbright <austinfulbright@Austins-Laptop.local>
Date: Tue, 20 Aug 2024 07:04:05 -0400
Subject: [PATCH] fixed merge

---
 packages/mermaid/src/diagrams/git/gitGraphParser.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/mermaid/src/diagrams/git/gitGraphParser.ts b/packages/mermaid/src/diagrams/git/gitGraphParser.ts
index a6911d442..c56bc6f44 100644
--- a/packages/mermaid/src/diagrams/git/gitGraphParser.ts
+++ b/packages/mermaid/src/diagrams/git/gitGraphParser.ts
@@ -69,7 +69,7 @@ const parseMerge = (merge: MergeAst): MergeDB => {
   const mergeDB: MergeDB = {
     branch: merge.branch,
     id: merge.id ?? '',
-    type: merge.type !== undefined ? commitType[merge.type] : commitType.NORMAL,
+    type: merge.type !== undefined ? commitType[merge.type] : undefined,
     tags: merge.tags ?? undefined,
   };
   return mergeDB;