test_field_merge
of the same field on the wire (Fixes #91) t/generated-code2/test-generated-code2.c: add a test case for merging messages t/test-full.proto: expand message definitions to test for merging nested messages
this commit fixes VPATH builds where the build tree is separate from the source tree. this will allow us to run "make distcheck".