← 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-05 11:33:58 UTC
  • mfrom: (5008.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100205113358-wd4d49omal1hus75
(vila) Add --take-this and --take-other actions to bzr resolve

Show diffs side-by-side

added added

removed removed

Lines of Context:
NEWS
25
25
  automatically or by running ``apport-bug``.  No information is sent
26
26
  without specific permission from the user.  (Martin Pool, #515052)
27
27
 
 
28
* Tree-shape conflicts can be resolved by providing ``--take-this`` and
 
29
  ``--take-other`` to the ``bzr resolve`` command. Just marking the conflict
 
30
  as resolved is still accessible via the ``--done`` default action.
 
31
  (Vincent Ladeuil)
 
32
 
28
33
Bug Fixes
29
34
*********
30
35