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

#3238 Merge from 'develop'

Browse Source
This commit is contained in:
ashishj
2022-08-30 18:11:10 +02:00
parent e542339ed1 d7e0888801
commit d2aaf6aad9
4 changed files with 76 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/diagrams/git/gitGraphAst.js
View File

@@ -150,6 +150,8 @@ export const branch = function (name, order) {
export const merge = function (otherBranch, custom_id, override_type, custom_tag) {
otherBranch = common.sanitizeText(otherBranch, configApi.getConfig());
custom_id = common.sanitizeText(custom_id, configApi.getConfig());
const currentCommit = commits[branches[curBranch]];
const otherCommit = commits[branches[otherBranch]];
if (curBranch === otherBranch) {