mirror of
https://github.com/mermaid-js/mermaid.git
synced 2025-10-19 22:19:45 +02:00
allows for custom merge type
This commit is contained in:
@@ -65,7 +65,7 @@ const parseMerge = (merge: MergeAst) => {
|
|||||||
const branch = merge.branch;
|
const branch = merge.branch;
|
||||||
const id = merge.id ?? '';
|
const id = merge.id ?? '';
|
||||||
const tags = merge.tags ?? undefined;
|
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);
|
db.merge(branch, id, type, tags);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user