← 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-11-07 14:14:44 UTC
  • mfrom: (5530.1.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20101107141444-r9agveqsbq5mka5u
(vila) Merge 2.2 into trunk including fix for bug #646961 (Vincent
        Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/release-notes/bzr-2.3.txt
37
37
.. Fixes for situations where bzr would previously crash or give incorrect
38
38
   or undesirable results.
39
39
 
 
40
* ``bzr resolve --take-other <file>`` will not crash anymore if ``<file>``
 
41
  is involved in a text conflict (but the conflict is still not
 
42
  resolved). (Vincent Ladeuil, #646961)
 
43
 
40
44
* Report error if non-ASCII command option given. (Rory Yorke, #140563)
41
45
 
42
46
Documentation