Viewing all changes in revision 2673.

Committer: Canonical.com Patch Queue Manager
Date: 2007-08-06 04:01:04 UTC
mfrom: <a title="Merged From 2665.2.1" href="/~bzr-pqm/bzr/bzr.dev/revision/2665.2.1?remember=3641.5.3">(2665.2.1 nameerror-in-merge)
Revision ID: pqm@pqm.ubuntu.com-20070806040104-af06p8gf7bsb3eze

(robertc) Merge Michael Hudson's merge --weave --show-base error output fix. (Michael Hudson)

added added

removed removed