mirror of
https://github.com/mermaid-js/mermaid.git
synced 2025-01-28 07:03:17 +08:00
fixed small error
This commit is contained in:
parent
66e53df04b
commit
b93691be0e
@ -215,7 +215,7 @@ export const merge = (
|
||||
const verifiedBranch: string = otherBranchCheck ? otherBranchCheck : ''; //figure out a cleaner way to do this
|
||||
|
||||
const commit = {
|
||||
id: customId ?? `${state.records.seq}-${getID()}`,
|
||||
id: customId || `${state.records.seq}-${getID()}`,
|
||||
message: `merged branch ${otherBranch} into ${state.records.currBranch}`,
|
||||
seq: state.records.seq++,
|
||||
parents: state.records.head == null ? [] : [state.records.head.id, verifiedBranch],
|
||||
|
Loading…
x
Reference in New Issue
Block a user