← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to NEWS

  • Committer: aaron.bentley at utoronto
  • Date: 2005-09-04 03:32:17 UTC
  • mfrom: (974.1.52)
  • mto: (1185.3.4)
  • mto: This revision was merged to the branch mainline in revision 1178.
  • Revision ID: aaron.bentley@utoronto.ca-20050904033217-821a797652305c14
Disabled urlgrabber

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
 
 
27
    * Fix case of $EDITOR containing options for the editor.
 
28
 
16
29
 
17
30
  CHANGES:
18
31