/alloc_engine_messages.cc -diff merge=ours /alloc_engine_messages.h -diff merge=ours /dhcpsrv_messages.cc -diff merge=ours /dhcpsrv_messages.h -diff merge=ours /fuzz_messages.cc -diff merge=ours /fuzz_messages.h -diff merge=ours /hosts_messages.cc -diff merge=ours /hosts_messages.h -diff merge=ours