← 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-10 16:25:28 UTC
  • mfrom: (5020.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100210162528-00g29u0ex6vzv914
(gerard) Update performs two merges in a more logical order but stop
        on conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
NEWS
77
77
  the same value to avoid confusing ``make`` and other date-based build
78
78
  systems. (Robert Collins, #515631)
79
79
 
 
80
* ``bzr update`` performs the two merges in a more logical order and will stop
 
81
  when it encounters conflicts.  
 
82
  (Gerard Krol, #113809)
 
83
 
80
84
Improvements
81
85
************
82
86