From 7815c8b9418fdbf743bd399c19cdd80cb46ffc36 Mon Sep 17 00:00:00 2001 From: umarcor Date: Thu, 5 Sep 2019 12:20:25 +0200 Subject: [PATCH] fix(diff): use arg '--strip-trailing-cr' (#949) --- cobra/cmd/golden_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cobra/cmd/golden_test.go b/cobra/cmd/golden_test.go index 99b92e31b7..832ea53346 100644 --- a/cobra/cmd/golden_test.go +++ b/cobra/cmd/golden_test.go @@ -43,7 +43,7 @@ func compareFiles(pathA, pathB string) error { // Don't execute diff if it can't be found. return nil } - diffCmd := exec.Command(diffPath, "-u", pathA, pathB) + diffCmd := exec.Command(diffPath, "-u", "--strip-trailing-cr", pathA, pathB) diffCmd.Stdout = output diffCmd.Stderr = output