fix(diff): use arg '--strip-trailing-cr' (#949)
In tests with diff, ignores trailing carriage returns (so tests pass on windows)
This commit is contained in:
		
				
					committed by
					
						
						GitHub
					
				
			
			
				
	
			
			
			
						parent
						
							442031e4ff
						
					
				
				
					commit
					62a72cdd0f
				
			@ -43,7 +43,7 @@ func compareFiles(pathA, pathB string) error {
 | 
				
			|||||||
			// Don't execute diff if it can't be found.
 | 
								// Don't execute diff if it can't be found.
 | 
				
			||||||
			return nil
 | 
								return nil
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
		diffCmd := exec.Command(diffPath, "-u", pathA, pathB)
 | 
							diffCmd := exec.Command(diffPath, "-u", "--strip-trailing-cr", pathA, pathB)
 | 
				
			||||||
		diffCmd.Stdout = output
 | 
							diffCmd.Stdout = output
 | 
				
			||||||
		diffCmd.Stderr = output
 | 
							diffCmd.Stderr = output
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user