~bzr-pqm/bzr/bzr.dev

Committer: Canonical.com Patch Queue Manager
Date: 2010-11-07 11:35:11 UTC
mfrom: (5050.51.3 646961-attr-error)
mto: (5050.59.1 2.2.3-dev) (5530.1.1 trunk) (5535.1.1 merge-2.2-into-devel) (5551.1.1 trunk) (5552.1.1 583667-lp-no-edge-2.3) (5554.1.3 trunk) (5573.1.1 merge_2.2_to_dev) (5579.1.1 693880-ssl-readline) (5609.6.1 2.3.0-dev) (6024.3.1 integration) (6012.1.1 trunk) (4797.94.3 2.2-feature-flags)
mto: This revision was merged to the branch mainline in revision 5531.
Revision ID: pqm@pqm.ubuntu.com-20101107113511-e2e09dl9fbedjgt9

(vila) Properly refuse to obey --take-this and --take-other for text
conflicts. (Vincent Ladeuil)

added added

removed removed