/config_messages.cc              -diff merge=ours
/config_messages.h               -diff merge=ours
