← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to NEWS

  • 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

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