使用冲突标记分割文件 [英] Split a file with conflict markers

问题描述

我正在寻找一种工具，将具有冲突标记的文件拆分为两个单独的文件。

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?

推荐答案

xxdiff可以做到：

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

这篇关于使用冲突标记分割文件的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！