~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to NEWS

  • Committer: Aaron Bentley
  • Date: 2007-12-25 04:17:50 UTC
  • mto: This revision was merged to the branch mainline in revision 3160.
  • Revision ID: aaron.bentley@utoronto.ca-20071225041750-t6chr3pmgnebvqcz
Handle non-directory parent conflicts (abentley, #177390)

Show diffs side-by-side

added added

removed removed

Lines of Context:
71
71
     user:pass embedded in the urls.
72
72
     (Vincent Ladeuil, #177643)
73
73
 
 
74
   * Files inside non-directories are now handled like other conflict types.
 
75
     (Aaron Bentley, #177390)
 
76
 
74
77
   * ``reconfigure`` is able to convert trees into lightweight checkouts.
75
78
     (Aaron Bentley)
76
79