Code Compare Integration with Mercurial

To integrate Code Compare into Mercurial, paste the following lines in the mercurial.ini file that is located in the user profile directory.

			[merge-tools]
			codecompare_merge.regkey=SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\CodeCompare_is1
			codecompare_merge.regname=InstallLocation
			codecompare_merge.regappend=CodeMerge.exe
			codecompare_merge.args=/SC=TortoiseHg /TF=$other /MF=$local /RF=$output /BF=$base /TT="Other: $other" /MT="Local: $local" /RT="Output: $output" /BT="Base: $base"
			codecompare_merge.binary=False
			codecompare_merge.gui=True
			codecompare_merge.checkconflicts=True
            codecompare_merge.premerge=Keep

			[extensions]
			extdiff=

			[extdiff]
			cmd.codecompare=C:\Program Files\Devart\Code Compare\CodeCompare.exe
			opts.codecompare=/SC=Hg /title1="$plabel1" /title2="$clabel" $parent $child

			[merge-patterns]
			*.*=codecompare_merge

			[ui]
			merge=codecompare_merge
      

For a brief introduction to the features of our diff and merge tool, refer to the product's overview page.

  • Code Compare Overview
  • Code Compare Oriented
  • Code Compare Integration to Visual Studio
  • Three-way comparison and merge
  • Folder Synchronization