whats the best way to compare conflicted text file

[syncnerd (synchy)]

is there a way to efficiently and quickly compare and add/subtract the conflicted file. do i need to use a third party tools?

[martinleben]

@syncnerd

do i need to use a third party tools?

Yes, you do. My favorite diff tool on Windows is Winmerge. Free & open source.