Diffing and merging tools AraxisMergeBeyondCompareCodeCompareDeltaWalkerSourceGear DiffMergeKDiff3MeldP4MergeSemanticMergeTortoiseGitMerge (for Git)TortoiseMerge (for SVN)UltraCompareWinMerge