marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-09-18 14:59:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed merge

Browse Source
This commit is contained in:
Austin Fulbright
2024-08-20 07:04:05 -04:00
parent 94ee076aad
commit 3ac242978d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/mermaid/src/diagrams/git/gitGraphParser.ts
View File

@@ -69,7 +69,7 @@ const parseMerge = (merge: MergeAst): MergeDB => {
const mergeDB: MergeDB = { const mergeDB: MergeDB = {
branch: merge.branch, branch: merge.branch,
id: merge.id ?? '', id: merge.id ?? '',
type: merge.type !== undefined ? commitType[merge.type] : commitType.NORMAL, type: merge.type !== undefined ? commitType[merge.type] : undefined,
tags: merge.tags ?? undefined, tags: merge.tags ?? undefined,
}; };
return mergeDB; return mergeDB;