← 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: 2010-02-18 03:02:28 UTC
  • mfrom: (5037.3.2 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100218030228-dtbmt8pdtf21ndo7
(mbp, for doxx) better win32 cmdline splitter

Show diffs side-by-side

added added

removed removed

Lines of Context:
NEWS
40
40
  automatically or by running ``apport-bug``.  No information is sent
41
41
  without specific permission from the user.  (Martin Pool, #515052)
42
42
 
 
43
* Parsing of command lines, for example in ``diff --using``, no longer
 
44
  treats backslash as an escape character on Windows.   (Gordon Tyler,
 
45
  #392248)
 
46
 
43
47
* Tree-shape conflicts can be resolved by providing ``--take-this`` and
44
48
  ``--take-other`` to the ``bzr resolve`` command. Just marking the conflict
45
49
  as resolved is still accessible via the ``--done`` default action.