When you merge a branch with its Merge button, a Recent Merge panel now appears in the bottom right corner of the conversation, named after the branch the merge came from. It shows on any conversation in that tree for 24 hours.
Choose Revert, say why if you like, and choose Complete Revert. What the merge added is taken out again, and a message the merge rewrote gets its original text back. The page updates by itself, with no reload. Choose Dismiss to keep the merge and close the panel.
Merges made before this update cannot be undone this way, and neither can a message you have edited since the merge. Merges from the Merge Board do not appear in the panel.