~bzr-pqm/bzr/bzr.dev

Viewing changes to NEWS

- code to represent merges in regular text conflict form

added added

removed removed

CHANGES:

* When exporting to a tarball with ``bzr export --format tgz``, put

everything under a top directory rather than dumping it into the

current directory. This can be overridden with the ``--root``

option. Patch from William Dod� and John Meinel.

* New ``bzr upgrade`` command to upgrade the format of a branch,

replacing ``bzr check --update``.