svn: head/usr.sbin/mergemaster

[Maxim Sobolev]

Doug Barton wrote:
>   Given that this is a situation that comes up very infrequently (usually
>   only for a major version upgrade) and can usually be handled simply
>   enough on a one-off basis, I will once again point out that I think
>   this is a Bad Idea. I would be willing to consider a better implementation
>   as an option that is off by default.

You are very wrong on this. This situation happens very *frequently* 
even for updates between minor releases (such as 6.3 to 6.4 and so on). 
As somebody doing lot of source upgrades frequently I can tell you this 
for sure.

-Maxim