How to add lines from both sources in a 3-way merge

[JeanLibera]

When I do a 3-way merge, sometimes I would like to add text from both sources, but it seems like I have to pick one or the other for each merge conflict. I know that I can pick one source and then copy-paste in the text from the other source, but is there a way to avoid copy-paste by clicking both arrows in the merge window?

[Aaron]

Hello,

In the Edit menu -> we have Take Left then Right and also Take Right then Left. They aren't on the toolbar, but can have hotkeys assigned to them.