GIT 2或更多将冲突合并成单一档案——第4页如何处理?
原文：GIT 2 or more merge conflicts in a single file - how p4merge handles?

GIT p4mer - 2 or more conflict in same file