← Back to branch summary

~bzr-pqm/bzr/2.5

Viewing all changes in revision 6515.

  • Committer: Patch Queue Manager
  • Date: 2013-05-30 12:53:09 UTC
  • mfrom: (6514.1.3 2.5-merges-2.4)
  • Revision ID: pqm@pqm.ubuntu.com-20130530125309-990eb4a5pn4sht37
(jameinel) Merge 2.4 into 2.5,
 bringing in the fix for bug #855155 (Dirstate.update_basis_by_delta) (John A
 Meinel)

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: