← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to NEWS

  • Committer: Robert Collins
  • Date: 2005-10-06 22:15:52 UTC
  • mfrom: (1185.13.2)
  • mto: This revision was merged to the branch mainline in revision 1420.
  • Revision ID: robertc@robertcollins.net-20051006221552-9b15c96fa504e0ad
merge from upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
NEWS
1
 
DEVELOPMENT HEAD
 
1
bzr 0.1 2005-10-06
2
2
 
3
3
 
4
4
  BUG FIXES:
36
36
    * 'bzr status' now shows unknown files inside a selected directory.
37
37
      Patch from Heikki Paajanen.
38
38
 
 
39
    * Merge conflicts are recorded in .bzr. Two new commands 'conflicts'
 
40
      and 'resolve' have needed added, which list and remove those 
 
41
      merge conflicts respectively. A conflicted tree cannot be committed
 
42
      in. Contributed by Aaron Bentley.
 
43
 
39
44
 
40
45
  INTERNALS:
41
46