Page 1 of 1

WinMerge - Navigate Conflicts Only Feature?

PostPosted: Thu Aug 18, 2011 3:07 pm
by adamhilton
I’m trying out various tools as a replacement for the default merging tool for TFS 2010 and Visual Studio 2010. I really like WinMerge but the default TFS merging tool has a feature that is a requirement for any replacement merging tool: Navigate Conflicts Only.

Basically what this does is when I have to manually merge a file with 25 differences but only 1 conflict that can't be automatically resolved, I need to be able to go directly to that one conflict, resolve it, and move on; not waist time with manually merging the entire file.

Is there a way to do this with WinMerge?