← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/en/release-notes/bzr-2.3.txt

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-12-03 08:31:44 UTC
  • mfrom: (4597.14.11 638451-malformed)
  • Revision ID: pqm@pqm.ubuntu.com-20101203083144-b2qfwgifwp1wq6zv
(vila) Implement resolve --take-this and --take-other for text conflicts.
 (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/release-notes/bzr-2.3.txt
26
26
.. Improvements to existing commands, especially improved performance 
27
27
   or memory usage, or better results.
28
28
 
 
29
* ``bzr resolve`` now accepts ``--take-this`` and ``--take-other`` actions
 
30
  for text conflicts. This *replace* the whole file with the content
 
31
  designated by the action. This will *ignore* all differences that would
 
32
  have been merge cleanly otherwise. (Vincent Ladeuil, #638451)
 
33
 
29
34
Bug Fixes
30
35
*********
31
36