← 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-03 07:18:36 UTC
  • mto: (5008.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5009.
  • Revision ID: v.ladeuil+lp@free.fr-20100203071836-u9b86q68fr9ri5s6
Fix NEWS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
NEWS
19
19
New Features
20
20
************
21
21
 
 
22
* Tree-shape conflicts can be resolved by providing ``--take-this`` and
 
23
  ``--take-other`` to the ``bzr resolve`` command. Just marking the conflict
 
24
  as resolved is still accessible via the ``--done`` default action.
 
25
  (Vincent Ladeuil)
 
26
 
22
27
bzr 2.1.0 (not released yet)
23
28
############################
24
29
 
155
160
  ``bazaar.conf``, ``locations.conf`` and/or ``branch.conf``.
156
161
  (Ted Gould, Matthew Fuller, Vincent Ladeuil)
157
162
 
158
 
* Tree-shape conflicts can be resolved by providing ``--take-this`` and
159
 
  ``--take-other`` to the ``bzr resolve`` command. Just marking the conflict
160
 
  as resolved is still accessible via the ``--done`` default action.
161
 
  (Vincent Ladeuil)
162
 
 
163
163
Bug Fixes
164
164
*********
165
165