Diffing and merging tools Standalone tools for comparing and merging text, code, and files. AraxisMergeBeyondCompareCodeCompareDeltaWalkerSourceGear DiffMergeKDiff3MeldP4MergeSemanticMergeTortoiseGitMerge (for Git)TortoiseMerge (for SVN)UltraCompareWinMerge