mirror of
https://github.com/mermaid-js/mermaid.git
synced 2025-09-17 22:39:56 +02:00
fixed merge
This commit is contained in:
@@ -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;
|
||||
|
Reference in New Issue
Block a user