~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-11 08:45:19 UTC
  • mfrom: (4597.9.22 reports-conflict-resolved)
  • Revision ID: pqm@pqm.ubuntu.com-20101111084519-bmk1zmblp7kex41a
(vila) More feedback about the conflicts just resolved and the remaining
 ones. (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
31
31
  options matching a given regular expression is now controlled via the
32
32
  ``--all`` option.  (Vincent Ladeuil, bug #670251)
33
33
 
 
34
* ``bzr resolve`` now reports the number of conflicts resolved and the
 
35
  number of remaining conflicts. This provides a better feedback about the
 
36
  whole resolution process. (Vincent Ladeuil)
 
37
 
34
38
Bug Fixes
35
39
*********
36
40