← 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: 2007-03-13 17:57:55 UTC
  • mfrom: (1551.10.40 Aaron's mergeable stuff)
  • Revision ID: pqm@pqm.ubuntu.com-20070313175755-809681c81472204a
Merge autodetects line ending for conflict markers

Show diffs side-by-side

added added

removed removed

Lines of Context:
NEWS
10
10
 
11
11
    * Added support for Putty's SSH implementation. (Dmitry Vasiliev)
12
12
 
 
13
    * Merge now autodetects the correct line-ending style for its conflict
 
14
      markers.  (Aaron Bentley)
 
15
 
13
16
  INTERNALS:
14
17
 
15
18
    * Refactored SSH vendor registration into SSHVendorManager class.