How can I get WinMerge to keep left and right?
merge, winmerge
Solution
Check out KDiff3... best free three-way merge tool out there.
Problem
Using the TFS merge tool, I can click on the left side and the right side to keep both changes/conflicts. This is needed when I add a method and another team member adds a method in the same place and I need to keep them both. In WinMerge (file merge, not folder), it seems that I can only overwrite the right with the left. Is it possible to make WinMerge copy the left to the right, and keep the right?