tree 31ca2e0eb5d168de32b793ab42eaa98a2b2a262d
parent 0c1f6d65b5a189c2250d10e71a5506f06f9fa0a0
author matloob@google.com <matloob@golang.org> 1466189340 -0400
committer matloob@google.com <matloob@golang.org> 1467127272 -0400

proto: import change from Google.

Add tests for merging a map field. When src contains a duplicate key,
its value message replaces (not merges with) the value message in dst.