pebkac, but is it a mergemaster bug?

[Ian FREISLICH]

Ed Schouten wrote:
> * Eygene Ryabinkin <rea-fbsd at codelabs.ru> wrote:
> > Doug, I am going to implement this stuff.  May be I am overseeing
> > something and there are another ways to overcome this problem?  Will
> > you commit such an extension to the mergemaster?
> 
> While you're hacking on mergemaster, could you please change mergemaster
> to install files when the files are exactly the same, except for the
> $FreeBSD$ string? It makes switching to different CVS/SVN branches of
> the FreeBSD source tree a lot harder. ;-)

I believe that the '-F' option does this.

Ian

--
Ian Freislich