Viewing all changes in revision 6013.

Committer: Canonical.com Patch Queue Manager
Date: 2011-07-07 12:07:41 UTC
mfrom: <a title="Merged From 6012.1.1" href="/~bzr-pqm/bzr/bzr.dev/revision/6012.1.1?remember=6060">(6012.1.1 trunk)
Revision ID: pqm@pqm.ubuntu.com-20110707120741-pfagsqufrv57xoe1

(vila) Handle path conflicts involving different root-ids (merged in
from 2.3 + tweaks) (Vincent Ladeuil)

added added

removed removed