~bzr-pqm/bzr/bzr.dev

Viewing changes to NEWS

(jam) Update 'bzr merge --weave' to generate conflicts when one side
modifies and one side deletes a line. (bug #328171)

added added

removed removed

* Adding now works properly when path contains a symbolic link.

(Geoff Bache, #183831)

* ``bzr merge --weave`` will now generate a conflict if one side deletes a

line, and the other side modifies the line. (John Arbash Meinel, #328171)

* ``bzr send`` works to send emails again using MAPI.

(Neil Martinsen-Burrell, #346998)