← Back to branch summary

~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 6619.1.1.

  • Committer: Vincent Ladeuil
  • Date: 2017-01-17 13:48:10 UTC
  • mfrom: (6615.3.6 merges)
  • mto: This revision was merged to the branch mainline in revision 6620.
  • Revision ID: v.ladeuil+lp@free.fr-20170117134810-j9p3lidfy6pfyfsc
Merge 2.7, resolving conflicts

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: