← 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: Vincent Ladeuil
  • Date: 2011-07-04 07:49:46 UTC
  • mto: This revision was merged to the branch mainline in revision 6008.
  • Revision ID: v.ladeuil+lp@free.fr-20110704074946-p9zltj4p5oi73dn9
Fix typo in bug number

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).