pebkac, but is it a mergemaster bug?

[Eygene Ryabinkin]

Ed, good day.

Mon, Jul 06, 2009 at 01:08:52PM +0200, Ed Schouten wrote:
> 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. ;-)

It's 'mergemaster -F'.
-- 
Eygene
 _                ___       _.--.   #
 \`.|\..----...-'`   `-._.-'_.-'`   #  Remember that it is hard
 /  ' `         ,       __.--'      #  to read the on-line manual
 )/' _/     \   `-_,   /            #  while single-stepping the kernel.
 `-'" `"\_  ,_.-;_.-\_ ',  fsc/as   #
     _.-'_./   {_.'   ; /           #    -- FreeBSD Developers handbook
    {_.-``-'         {_/            #