tree 1dd012f8638ad3b5024b18ca61fcd19d3accb14e
parent bee625258d620743b95965fe902b5e159c63461e
author Joe Tsai <joetsai@digital-static.net> 1569007135 -0700
committer Joe Tsai <joetsai@digital-static.net> 1569009342 +0000

proto: fix race in Merge

Some existing targets (whether correctly or not) rely on it Merge
being safe to call concurrently so long as the set of fields being
merged are disjoint.

Change-Id: I4db9e64efccc7a2d44a5f9b52261b611cce461b0
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/196737
Reviewed-by: Damien Neil <dneil@google.com>