They've been near-identical for years, now they're only one. It proved necessary to start merging the HUD code which for now is just a few cvar declarations (not even init), but that should be a separate set of commits.
Bill Currie