> Gentoo tries to handle this by managing all config files in CVS, so you can diff different versions and merge them.

Am I missing something? I wish it did this, but unless something has changed recently it just gives you a tool for merging updates in (and doesn't store old revisions).