1. timeless
  2. thg

Commits

Steve Borho  committed 6a68312

mergetools: remove thgKdiff3 configuration

Now that the bin/ folder is gone, kdiff3 is in the %PATH% again so there is no
need to find it via our registry key. This was causing kdiff3 to show up twice.

  • Participants
  • Parent commits 1d2c31a
  • Branches stable

Comments (0)

Files changed (1)

File contrib/mergetools.rc

View file
 kdiff3.diff3args=--L1 '$plabel1' --L2 '$clabel' --L3 '$plabel2' $parent1 $child $parent2
 kdiff3.dirdiff=True
 
-thgKdiff3.regkey=Software\TortoiseHg
-thgKdiff3.regappend=\kdiff3.exe
-thgKdiff3.priority=-4
-thgKdiff3.args=--auto --L1 base --L2 parent1 --L3 parent2 $base $local $other -o $output
-thgKdiff3.fixeol=False
-thgKdiff3.premerge=False
-thgKdiff3.gui=True
-thgKdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child
-thgKdiff3.diff3args=--L1 '$plabel1' --L2 '$clabel' --L3 '$plabel2' $parent1 $child $parent2
-thgKdiff3.dirdiff=True
-
 diffmerge.regkey=Software\SourceGear\SourceGear DiffMerge\
 diffmerge.regname=Location
 diffmerge.priority=-7