Repeated merges possible and displayed in brzr status

[James Blackwell]

On Sun, Oct 23, 2005 at 08:56:01AM +1000, Robert Collins wrote:
> On Wed, 2005-10-19 at 10:03 -0400, Aaron Bentley wrote:
> 
> > Though perhaps if a merge makes no file changes and pull would work, we
> > should error out and suggest pull.
> 
> I would not error out, though suggesting pull is a good idea.
> 
> I.e. 
> 'No changes have occured, your branch is synchronised with $URL and you
> are able to pull.'
> 
> The reason I dont want an error is that merge and pull are semantically
> different for the user, not just different in terms of mechanism. *I*

I know that I'm on the fringe with this, but I still think that
a pull is the semantic equivilant of a very simple three way merge.

Better yet, since the tool can tell which one is right, then why
complicate things for users such as the OP by making them learn the
difference?