marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-08-31 14:16:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into minmaps

Browse Source
This commit is contained in:
Knut Sveidqvist
2022-09-01 13:42:21 +02:00
parent 654dfa6b3d 98b2febe30
commit 68f8010ab9
17 changed files with 501 additions and 232 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