CURRENT, usr/src on git, howto "mergemaster"?

[Andrea Venturoli]

On 1/4/21 7:18 PM, Warner Losh wrote:

> mergemaster has been on its way out since well before the switch to git.
> It's been disfavored for at least a decade

I first heard about this today.
While I don't have any opinion on this, shouldn't any reference to it in 
the instructions in /usr/src/UPDATING be changed?
They way I read that file is that mergemaster is still the official way 
to go.

  bye & Thanks
	av.