~vila/bzr/2.2-integration

Viewing all changes in revision 5133.

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-07-05 11:17:07 UTC
  • mfrom: (5132.1.4 805809-no-final-path)
  • Revision ID: pqm@pqm.ubuntu.com-20110705111707-2bg7h2obs8ig67rq
(vila) Handle path conflicts involving different root-ids (Vincent Ladeuil)

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: