← 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: Vincent Ladeuil
  • Date: 2010-11-07 16:09:43 UTC
  • mto: (4597.14.1 638451-malformed)
  • mto: This revision was merged to the branch mainline in revision 5537.
  • Revision ID: v.ladeuil+lp@free.fr-20101107160943-qkz45h4pb748117i
resolve now reports conflicts resolved/remaining.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/release-notes/bzr-2.3.txt
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