Hello, I was wondering what people use to merge the various changes to config files when tracking CVS HEAD, without having to re-customize the config files each time you update them. I remember a util named mergemaster from FreeBSD, but I think it is FreeBSD specific. Thanks. AJ