~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-06 17:13:00 UTC
  • mfrom: (3249.2.2 ianc-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20080306171300-yr2n8r9w4a4ettbo
Fix merge redirection when remembered location used - tweak tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
57
57
    * ``merge --preview`` now works for merges that add or modify
58
58
      symlinks (James Henstridge)
59
59
 
 
60
    * Redirecting the output from ``bzr merge`` (when the remembered
 
61
      location is used) now works. (John Arbash Meinel)
 
62
 
60
63
    * Upgrade bundled ConfigObj to version 4.5.1, which properly quotes #
61
64
      signs, among other small improvements. (Matt Nordhoff, #86838)
62
65