Diffing and merging tools AraxisMerge BeyondCompare CodeCompare DeltaWalker SourceGear DiffMerge KDiff3 Meld P4Merge SemanticMerge TortoiseGitMerge (for Git) TortoiseMerge (for SVN) UltraCompare WinMerge