← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to NEWS

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-02-03 09:04:38 UTC
  • mfrom: (4999.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100203090438-2qn9wus9kyyfyyek
(vila) Merge 2.1 to trunk,
        including fix for bug #515597 (per-file merge hook typo)

Show diffs side-by-side

added added

removed removed

Lines of Context:
NEWS
69
69
  increase memory pressure on processes using threads.
70
70
  (Robert Collins, John Arbash Meinel, #514090)
71
71
 
 
72
* The new ``merge_file_content`` should now be ok with tests to avoid
 
73
  regressions.
 
74
  (Vincent Ladeuil, #515597)
72
75
 
73
76
bzr 2.1.0rc2
74
77
############