On Tue, 23 Sep 2003, Jim C. Nasby wrote: > I think a far better solution would be to give mergemaster the ability > to compare files to the version in CVS as reported by the $FreeBSD$ tag. In 99% of cases, there is no CVS repo to compare against. -- Doug White | FreeBSD: The Power to Serve dwhite at gumbysoft.com | www.FreeBSD.org