Merge pull request #12703 from ethereum/diff-color-fix

cameel · web-flow · commit 1aacb67a1057 · 2022-02-24T17:47:19.000+01:00
scripts/common.sh: 'diff --color' not supported by macOS.
diff --git a/scripts/common.sh b/scripts/common.sh
@@ -180,7 +180,7 @@ function diff_values
     shift
     shift
 
-    diff --color=auto --unified=0 <(echo "$value1") <(echo "$value2") "$@"
+    diff --unified=0 <(echo "$value1") <(echo "$value2") "$@"
 }
 
 function safe_kill

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ function diff_values`
`180`	`180`	`shift`
`181`	`181`	`shift`
`182`	`182`
`183`		`- diff --color=auto --unified=0 <(echo "$value1") <(echo "$value2") "$@"`
	`183`	`+ diff --unified=0 <(echo "$value1") <(echo "$value2") "$@"`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`function safe_kill`