Applying: `istioctl ps` via istio agents.
Applying: Fix lint errors
Applying: Fix lint errors
Applying: Use k8s client_go instead of RESTClient
Applying: Update pkg/kube/client.go
Applying: Use constant for "status.phase=Running"
Applying: Use the revision in the annotation instead of labels for the injected pods
Applying: Add xds-via-agents-limit flag
Applying: Reflect the comments and refactoring
Using index info to reconstruct a base tree...
M	istioctl/cmd/internal-debug.go
M	istioctl/cmd/proxystatus.go
M	istioctl/pkg/multixds/gather.go
Falling back to patching base and 3-way merge...
Auto-merging istioctl/pkg/multixds/gather.go
CONFLICT (content): Merge conflict in istioctl/pkg/multixds/gather.go
Auto-merging istioctl/cmd/proxystatus.go
Auto-merging istioctl/cmd/internal-debug.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0009 Reflect the comments and refactoring
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".