[dev] Merging changes

[Michael M Slusarz]

This is driving me crazy... Is there any way to merge changes from the 
*.dist config files into my personal config files which will not blow-away 
my personal settings?  I used to make all these changes in the .dist files 
and then update via CVS, but i can't do that anymore lest I make a commit 
one day and CVS suddenly contains my setup :)  I have also played around 
with the 'merge' utility but that blows away all my personal settings.

Any help?

michael

______________________________________________
Michael Slusarz [slusarz@bigworm.colorado.edu]
The University of Colorado at Boulder