非图形3向合并工具

I currently use RCS' merge command to do 3-way merges, but one thing has always annoyed me about it. If I use the -A option, the same change made in both files shows up as a conflict:I currently use RCS' merge command to do 3-way