← Back to branch summary

~bzr/ubuntu/hardy/bzr/bzr-ppa

« back to all changes in this revision

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

  • Committer: Max Bowsher
  • Date: 2011-07-17 23:30:45 UTC
  • mfrom: (76.3.42 karmic)
  • Revision ID: _@maxb.eu-20110717233045-n093joucqnux0sq8
Tags: 2.3.4-0~bazaar1~hardy1
Merge 2.3.4

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/release-notes/bzr-2.2.txt
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