mirror of
https://github.com/mermaid-js/mermaid.git
synced 2025-01-14 06:43:25 +08:00
allows for custom merge type
This commit is contained in:
parent
3168084cf5
commit
9f6a7b79ac
@ -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);
|
||||
};
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user