Viewing all changes in revision 5153.

Committer: Canonical.com Patch Queue Manager
Date: 2010-04-14 07:26:43 UTC
mfrom: <a title="Merged From 5151.1.1" href="/~bzr-pqm/bzr/bzr.dev/revision/5151.1.1?remember=168">(5151.1.1 update)
Revision ID: pqm@pqm.ubuntu.com-20100414072643-kxva2lpej0ck8m4d

(robertc) Do not warn when updating if a pending merge was merged into
trunk. (Robert Collins, bug 562079)

added added

removed removed