Split a file with conflict markers

Question

I am looking for a tool that will split a file that has conflict markers into the two separate files. Is there anything out there that does this already?

Answer 1

xxdiff can do that:

xxdiff --unmerge myfile.txt

it also works if the conflict markers result from a 3-way diff

xxdiff --unmerge3 myfile.txt