A good, free, 3-way merging tool is very difficult to come by. Most tools that diff and merge either are not free, or they do not support 3-way merging, or they are simply have limited editing capabilities. Up to now, I have only found one tool that features all of these characteristics. However, SourceGear have now changed that by releasing their DiffMerge tool for free. DiffMerge includes features such as graphical diff, graphical merging between 3 files, folder diff, rulesets per file type and...