tree 88c00234e8313ca8c5fbd2c30876ceb946b60c00
parent 316febd1ab5f96d4223979c1c6de8a9c02435c56
author Damien Neil <dneil@google.com> 1581531977 -0800
committer Damien Neil <dneil@google.com> 1581535113 +0000

proto: remove shallow merge support, and MergeOptions

We're still debating what the semantics of shallow merges should be, and
what the use case for them (if any) is. There's no need to commit
ourselves to this feature at this time; drop it for now.

Remove the exported MergeOptions type, since the only option is gone. We
can trivially add it back in the future if we need it.

Change-Id: I4c8697cae69cc66eed1ea65de84b982f20e1be44
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/219145
Reviewed-by: Joe Tsai <joetsai@google.com>