← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to NEWS

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-03-03 18:14:09 UTC
  • mfrom: (3144.3.11 fix-conflict-handling)
  • Revision ID: pqm@pqm.ubuntu.com-20080303181409-gyupt23ikib7s46z
Use correct index in LCA merge (abentley, #196780)

Show diffs side-by-side

added added

removed removed

Lines of Context:
NEWS
54
54
    * Upgrade bundled ConfigObj to version 4.5.1, which properly quotes #
55
55
      signs, among other small improvements. (Matt Nordhoff, #86838)
56
56
 
 
57
    * Use correct indices when emitting LCA conflicts.  This fixes IndexError
 
58
      errors.  (Aaron Bentley, #196780)
 
59
 
57
60
  API BREAKS:
58
61
 
59
62
    * Support for loading plugins from zip files and