← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to NEWS

Fix diff3 conflict-reporting bug

Show diffs side-by-side

added added

removed removed

Lines of Context:
NEWS
29
29
    * Leave HttpTransportBase daughter classes decides how they
30
30
      implement cloning. (Vincent Ladeuil, #61606)
31
31
 
 
32
   * diff3 does not indicate conflicts on clean merge. (Aaron Bentley)
 
33
 
32
34
  TESTING:
33
35
 
34
36
    * New test base class TestCaseWithMemoryTransport offers memory-only