~bzr-pqm/bzr/bzr.dev

Viewing changes to NEWS

Resolve --take-this or --take-other correctly rename kept file

added added

removed removed

* ``bzr remove-tree`` can now remove multiple working trees.

(Jared Hance, Andrew Bennetts, #253137)

* ``bzr resolve --take-this`` and ``--take-other`` now correctly renames

the kept file on content conflicts where one side deleted the file.

(Vincent Ladeuil, #529968)

* ``bzr upgrade`` now names backup directory as ``backup.bzr.~N~`` instead

of ``backup.bzr``. This directory is ignored by bzr commands such as

``add``.