Viewing all changes in revision 5995.

Committer: Canonical.com Patch Queue Manager
Date: 2011-06-28 12:18:33 UTC
mfrom: <a title="Merged From 5988.2.3" href="/~bzr-pqm/bzr/bzr.dev/revision/5988.2.3?remember=6059">(5988.2.3 688101-duplicate-ids)
Revision ID: pqm@pqm.ubuntu.com-20110628121833-ax14ogkh8ks922nu

(vila) Do not generate path conflicts if a corresponding content conflict
exists. (Vincent Ladeuil)

added added

removed removed