[dev] Merging changes

[Jon Parise]

On Thu, May 30, 2002 at 12:47:43PM -0600, Michael M Slusarz wrote:

> 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.
 
One of these days, I'll hack together a script to make this easier.

-- 
Jon Parise (jon@csh.rit.edu)  .  Information Technology (2001)
http://www.csh.rit.edu/~jon/  :  Computer Science House Member