~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/en/release-notes/bzr-2.2.txt

Show diffs side-by-side

added added

removed removed

Lines of Context:
24
24
  doubly-stacked branch.
25
25
  (James Westby, Martin Pool, #715000)
26
26
 
 
27
* Don't crash while merging and encountering obscure path conflicts
 
28
  involving different root-ids. (Vincent Ladeuil, #805809)
 
29
 
27
30
Improvements
28
31
************
29
32