Merge pull request #456 from akhilerm/add-merge-as-single-commit

k8s-ci-robot · web-flow · commit bca43d5c7290 · 2024-10-29T16:56:55.000Z
Add merge commit to be picked as single commit
diff --git a/artifacts/scripts/util.sh b/artifacts/scripts/util.sh
@@ -541,6 +541,7 @@ function pick-merge-as-single-commit() {
 69bd30507559be3dea905686b46bc3295c951f45
 64718f678695884c93d6d3df8f5799614746bea2
 bc53b97ceb25338570a853845c4cdd295468ed61
+119f114f012ae6d1cd851bdb2c3f849307e83258
 EOF
 }
 

Original file line number	Diff line number	Diff line change
`@@ -541,6 +541,7 @@ function pick-merge-as-single-commit() {`
`541`	`541`	`69bd30507559be3dea905686b46bc3295c951f45`
`542`	`542`	`64718f678695884c93d6d3df8f5799614746bea2`
`543`	`543`	`bc53b97ceb25338570a853845c4cdd295468ed61`
	`544`	`+119f114f012ae6d1cd851bdb2c3f849307e83258`
`544`	`545`	`EOF`
`545`	`546`	`}`
`546`	`547`