computing the resulting inventory from the merge changeset

[duchier at ps.uni-sb.de]

Aaron Bentley <aaron.bentley at utoronto.ca> writes:

> Case #4:
> $ touch foo
> $ touch bar
> $ bzr add foo bar
> $ bzr commit
> $ rm foo
> $ bzr mv bar foo
> $ bzr commit

I think you meant:

  rm foo
  bzr rm foo

Cheers,

--Denys