← Back to branch summary

~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 5020.1.1.

  • Committer: Vincent Ladeuil
  • Date: 2010-02-10 15:46:03 UTC
  • mfrom: (4985.3.21 update)
  • mto: This revision was merged to the branch mainline in revision 5021.
  • Revision ID: v.ladeuil+lp@free.fr-20100210154603-k4no1gvfuqpzrw7p
https://launchpad.net/bugs/113809
Update performs two merges in a more logical order but stop on conflicts

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: