mirror of
				https://github.com/mermaid-js/mermaid.git
				synced 2025-11-03 20:34:20 +01:00 
			
		
		
		
	Merged typescript changes
This commit is contained in:
		@@ -175,7 +175,7 @@ describe('Gantt diagram', () => {
 | 
			
		||||
      Another task     :after a1, 20ms
 | 
			
		||||
      section Another
 | 
			
		||||
      Another another task      :b1, 20, 12ms
 | 
			
		||||
      Another another another task     :after b1, 24ms
 | 
			
		||||
      Another another another task     :after b1, 0.024s
 | 
			
		||||
        `,
 | 
			
		||||
      {}
 | 
			
		||||
    );
 | 
			
		||||
 
 | 
			
		||||
@@ -253,4 +253,32 @@ describe('Git Graph diagram', () => {
 | 
			
		||||
      {}
 | 
			
		||||
    );
 | 
			
		||||
  });
 | 
			
		||||
  it('13: should render a simple gitgraph with three branches,custom merge commit id,tag,type', () => {
 | 
			
		||||
    imgSnapshotTest(
 | 
			
		||||
      `gitGraph
 | 
			
		||||
       commit id: "1"
 | 
			
		||||
       commit id: "2"
 | 
			
		||||
       branch nice_feature
 | 
			
		||||
       checkout nice_feature
 | 
			
		||||
       commit id: "3"
 | 
			
		||||
       checkout main
 | 
			
		||||
       commit id: "4"
 | 
			
		||||
       checkout nice_feature
 | 
			
		||||
       branch very_nice_feature
 | 
			
		||||
       checkout very_nice_feature
 | 
			
		||||
       commit id: "5"
 | 
			
		||||
       checkout main
 | 
			
		||||
       commit id: "6"
 | 
			
		||||
       checkout nice_feature
 | 
			
		||||
       commit id: "7"
 | 
			
		||||
       checkout main
 | 
			
		||||
       merge nice_feature id: "customID" tag: "customTag" type: REVERSE
 | 
			
		||||
       checkout very_nice_feature
 | 
			
		||||
       commit id: "8"
 | 
			
		||||
       checkout main
 | 
			
		||||
       commit id: "9"
 | 
			
		||||
      `,
 | 
			
		||||
      {}
 | 
			
		||||
    );
 | 
			
		||||
  });
 | 
			
		||||
});
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user