Following an attempted git merge on the commandline, my file now has standard conflict markers in it which emacs has helpfully reloaded (reverted?) in the buffer.
How do I start some kind of merging mode to resolve the conflict? Can I get seperate buffers showing left/right/merged versions of the file like when I ediff-files?
(emacs-prelude v24.4 on a Mac)