← 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-06-28 12:18:33 UTC
  • mfrom: (5988.2.3 688101-duplicate-ids)
  • Revision ID: pqm@pqm.ubuntu.com-20110628121833-ax14ogkh8ks922nu
(vila) Do not generate path conflicts if a corresponding content conflict
 exists. (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/release-notes/bzr-2.4.txt
33
33
  decoded as UTF-8 or when it cannot be parsed.
34
34
  (Vincent Ladeuil, #502060, #688677, #792246)
35
35
 
 
36
* Generate a single conflict (instead of two) when merging a branch
 
37
  modifying and renaming a file in a branch that deleted it (or vice-versa).
 
38
  (Vincent Ladeuil, #688101)
 
39
 
36
40
* Properly load utf8-encoded config files. (Vincent Ladeuil, #799212)
37
41
 
38
42
* ``GraphThunkIdsToKeys.merge_sort`` now properly returns