When resolving a merge conflict using Atom's git integration, how can I choose "use both"?


I see the buttons to choose one or the other, but I don’t see an option to include both changes, an option which I’ve seen in other merge tools. Am I missing something, or is this not currently supported?


Click the hamburger menu, where you should see more options.