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

feat(git): allow custom merge commit ids

Browse Source 
Currently, merge commits can have a git tag, but they cannot have a
custom git commit ID.

This commit allows modifying the default merge commit id.
It also displays all merge commits IDs, which undoes
3ccf027f42
This commit is contained in:
Alois Klink
2022-08-25 23:18:13 +01:00
parent cde3a7cf70
commit b2f5ba3ee8
6 changed files with 89 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cypress/integration/rendering/gitGraph.spec.js
View File

@@ -74,7 +74,7 @@ describe('Git Graph diagram', () => {
{}
);
});
it('7: should render a simple gitgraph with three branches and merge commit', () => {
it('7: should render a simple gitgraph with three branches and tagged merge commit', () => {
imgSnapshotTest(
`gitGraph
commit id: "1"
@@ -93,7 +93,7 @@ describe('Git Graph diagram', () => {
checkout nice_feature
commit id: "7"
checkout main
merge nice_feature
merge nice_feature id: "12345" tag: "my merge commit"
checkout very_nice_feature
commit id: "8"
checkout main