← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to NEWS

Add a NEWS entry and prepare submission.

Show diffs side-by-side

added added

removed removed

Lines of Context:
NEWS
17
17
New Features
18
18
************
19
19
 
 
20
* Tree-shape conflicts can be resolved by providing ``--keep-mine`` and
 
21
  ``--take-their`` to the ``bzr resolve`` command. Just marking the conflict
 
22
  as resolved is still accessible via the ``--done`` default action.
 
23
  (Vincent Ladeuil, #257297, #232512)
 
24
 
20
25
Bug Fixes
21
26
*********
22
27