50
50
* ``bzr merge --weave`` will now generate a conflict if one side deletes a
51
51
line, and the other side modifies the line. (John Arbash Meinel, #328171)
53
56
* ``bzr send`` works to send emails again using MAPI.
54
57
(Neil Martinsen-Burrell, #346998)