Advanced 2 and 3-way file comparison (diff), merging and folder synchronization.
Free file and folder diff & merge tool, Visual Studio integrated.
Visual file and source code compare utility.