Commits

Angel Ezquerra  committed 8b77859

mergetools: add Windows support for "meld"

There is now a windows installer for meld
(https://code.google.com/p/meld-installer/). This patch moves the meld mergetool
definition out of the "Linux only diff tools" section and adds the required
"regkey" and "regaltkey" entries that will let TortoiseHg find meld on Windows.

  • Participants
  • Parent commits 28dd34c
  • Branches stable

Comments (0)

Files changed (1)

File contrib/mergetools.rc

 winmergeu.diff3args=
 winmergeu.dirdiff=True
 
+meld.regkey=SOFTWARE\Meld\Executable
+meld.regaltkey=SOFTWARE\Wow6432Node\Meld\Executable
+meld.gui=True
+meld.args=--label='local' $local --label='base' $base --label='other' $other
+meld.priority=-2
+meld.diffargs=-a --label='$plabel1' $parent --label='$clabel' $child
+meld.diff3args=-a --label='$plabel1' $parent1 --label='$clabel' $child --label='$plabel2' $parent2
+meld.dirdiff=True
+
 ; TortoiseHg diff wrapper for some binary documents, not for merge general use
 docdiff.priority=-100
 docdiff.regkey=Software\TortoiseHg
 bcompare.diff3args=$parent1 $parent2 $child -lefttitle='$plabel1' -centertitle='$clabel' -righttitle='$plabel2' -solo -expandall
 bcompare.dirdiff=True
 
-meld.gui=True
-meld.args=--label='local' $local --label='base' $base --label='other' $other
-meld.priority=-2
-meld.diffargs=-a --label='$plabel1' $parent --label='$clabel' $child
-meld.diff3args=-a --label='$plabel1' $parent1 --label='$clabel' $child --label='$plabel2' $parent2
-meld.dirdiff=True
-
 diffuse.priority=-3
 diffuse.args=$local $base $other
 diffuse.gui=True