~bzr-pqm/bzr/bzr.dev

Viewing changes to NEWS

(jam) For 'bzr merge' enable '--reprocess' by default whenever
'--show-base' is not set.

added added

removed removed

towards your mainline. This simplifies the output, makes it faster,

and reduces memory consumption. (John Arbash Meinel)

* ``bzr merge`` now defaults to having ``--reprocess`` set, whenever

``--show-base`` is not supplied. (John Arbash Meinel)

* ``bzr+http//`` will now optionally load plugins and write logs on the

server. (Marius Kruger)