← 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.4.txt

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-07-04 08:34:57 UTC
  • mfrom: (6007.1.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20110704083457-ci2x6tjx21xri751
(vila) Fix typo in bug number (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/release-notes/bzr-2.4.txt
46
46
 
47
47
* Display a proper error message when a config file content cannot be
48
48
  decoded as UTF-8 or when it cannot be parsed.
49
 
  (Vincent Ladeuil, #502060, #688677, #792246)
 
49
  (Vincent Ladeuil, #502060, #688677, #797246)
50
50
 
51
51
* Generate a single conflict (instead of two) when merging a branch
52
52
  modifying and renaming a file in a branch that deleted it (or vice-versa).