This limitation can be worked around like this:
$ bzr merge <foo> $ bzr diff --using=<bar> $ bzr revert
This limitation can be worked around like this:
$ bzr merge <foo>
$ bzr diff --using=<bar>
$ bzr revert