02e7b25bc3
Regenerates docs/config-catalog and re-records its pairing hashes: master's side of that generated file merged textually, which leaves the recorded blob hashes describing neither side's content.