
Automatic merge from submit-queue Change all jsonmerge to strategicpatch Implement all jsonmerge changed to strategicpatch in edit.go.
Automatic merge from submit-queue Change all jsonmerge to strategicpatch Implement all jsonmerge changed to strategicpatch in edit.go.