Viewing all changes in revision 2665.2.1.

Committer: Michael Hudson
Date: 2007-08-01 08:38:24 UTC
mto: This revision was merged to the branch mainline in revision 2673 .
Revision ID: michael.hudson@canonical.com-20070801083824-k2wh3mt9uy1walu9

test and fix for a NameError in merge --weave --show-base

added added

removed removed