merge vs. "update -m" and working with a remote repository

[Bryan O'Sullivan]

On Sat, 2006-05-13 at 19:16 -0400, Sébastien Pierre wrote:

> Offering multiple alternatives for doing the same thing is somewhat  
> confusing, so I would suggest to deprecate "update -m" in favor of  
> "merge".

+1