Split file with conflict markers

Question

I am looking for a tool that splits a file with conflict markers into two separate files. Is there anything that does this already?

Answer 1

xxdiff can do this:

xxdiff --unmerge myfile.txt 

it also works if conflict markers are the result of tripartite diff

 xxdiff --unmerge3 myfile.txt 

Answer 2

The tool I work for ( ECMerge ) does this primarily to help you visually combine them visually. You can also save files left / right / ancestors with built-in Javascript engine. ECMerge reads markers for most of the "well-known" source code controls (CVS, git, mercurial, bazaar, SubVersion, Perforce, those that are compatible with previously cited and, of course, their own markers!).

Answer 3

Winmerge does this, they call it "Resolve conflict files." It works only on Windows.

Answer 4

As requested, my own solution to my question was to create the following Perl script.

http://github.com/quincy/Unmerge-Conflicts