← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/en/whats-new/whats-new-in-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:
doc/en/whats-new/whats-new-in-2.3.txt
111
111
  default behaviour is specified (if needed) by setting the variable to
112
112
  ``conflict``.  (Vincent Ladeuil, #323111)
113
113
 
 
114
* ``bzr resolve`` now provides more feedback about the conflicts just
 
115
  resolved and the remaining ones. (Vincent Ladeuil)
 
116
 
114
117
Documentation
115
118
*************
116
119