~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 5409.1.20.

  • Committer: Vincent Ladeuil
  • Date: 2010-09-21 16:58:50 UTC
  • mto: (5502.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 5504.
  • Revision ID: v.ladeuil+lp@free.fr-20100921165850-fkrlj18p68l7xxz4
Revert to 'conflict' being the default orphaning policy and fix fallouts.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: