← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to NEWS

  • Committer: Martin Pool
  • Date: 2005-08-30 06:49:06 UTC
  • Revision ID: mbp@sourcefrog.net-20050830064905-203cfbb58b1f5acc
- fix imports for moved errors

Show diffs side-by-side

added added

removed removed

Lines of Context:
NEWS
8
8
    * New expert command ``bzr find-merge-base`` for debugging merges.
9
9
 
10
10
 
 
11
  ENHANCEMENTS:
 
12
 
 
13
    * Much better merge support.
 
14
 
 
15
    * merge3 conflicts are now reported with markers like '<<<<<<<'
 
16
      (seven characters) which is the same as CVS and pleases things
 
17
      like emacs smerge.
 
18
 
 
19
 
11
20
  BUG FIXES:
12
21
 
13
22
    * ``bzr upgrade`` no longer fails when trying to fix trees that
14
23
      mention revisions that are not present.
15
24
 
 
25
    * Fixed bugs in listing plugins from ``bzr plugins``.
 
26
 
16
27
 
17
28
  CHANGES:
18
29