From 9f6a7b79ac31f7577ce9fb9c8c727b064eb9b658 Mon Sep 17 00:00:00 2001
From: Austin-Fulbright <53443958+Austin-Fulbright@users.noreply.github.com>
Date: Sat, 27 Jul 2024 00:49:07 -0400
Subject: [PATCH] allows for custom merge type

---
 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 b657b94b8..9ef5ae063 100644
--- a/packages/mermaid/src/diagrams/git/gitGraphParser.ts
+++ b/packages/mermaid/src/diagrams/git/gitGraphParser.ts
@@ -65,7 +65,7 @@ const parseMerge = (merge: MergeAst) => {
   const branch = merge.branch;
   const id = merge.id ?? '';
   const tags = merge.tags ?? undefined;
-  const type = merge.type !== undefined ? commitType[merge.type] : 0;
+  const type = merge.type !== undefined ? commitType[merge.type] : undefined;
   db.merge(branch, id, type, tags);
 };