t/generated-code2/test-generated-code2.c: Rename test_optional_merge to
test_field_merge