← 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: 2008-03-15 01:07:14 UTC
  • mfrom: (3249.3.4 cherrypick_merge)
  • Revision ID: pqm@pqm.ubuntu.com-20080315010714-k7pnu991eg5f0k0q
(jam) Implement Cherrypick support for Merge3

Show diffs side-by-side

added added

removed removed

Lines of Context:
NEWS
65
65
 
66
66
  BUGFIXES:
67
67
 
 
68
    * Cherrypicking when using ``--format=merge3`` now explictly excludes
 
69
      BASE lines. (John Arbash Meinel, #151731)
 
70
 
68
71
    * Disable plink's interactive prompt for password.
69
72
      (#107593, Dmitry Vasiliev)
70
73