Hi,
The output of 'hg debugconfig' command is in the attached file.
Indeed, I did change the way TortoiseHg is initialized. At first time, I
initialized TortoiseHg using the right-click in Windows Explorer.
Then, I pinned TortoiseHg on the Windows 7 taskbar and since then I am
starting TortoiseHg from there.
I restarted my computer and opened TortoiseHg many times from Windows
Explorer and the kdiff worked well.
Probably this is the reason....
Regards,
Luiz
On 2 June 2012 03:45, Yuya Nishihara <y...@tcha.org> wrote:
> On 06/02/12 00:35, Luiz Carlos da Costa Junior wrote:
>
>> Here is the output of 'hg debugconfig' command:
>> C:\Program Files\TortoiseHg\hgrc.d\**MergeTools.rc:12:
>> merge-tools.beyondcompare3.**dirdiff=True
>> C:\Program Files\TortoiseHg\hgrc.d\**MergeTools.rc:22:
>> merge-tools.beyondcompare2.**dirdiff=True
>> C:\Program Files\TortoiseHg\hgrc.d\**MergeTools.rc:45:
>> merge-tools.araxis.dirdiff=**True
>> C:\Program Files\TortoiseHg\hgrc.d\**MergeTools.rc:69:
>> merge-tools.kdiff3.dirdiff=**True
>> C:\Program Files\TortoiseHg\hgrc.d\**MergeTools.rc:80:
>> merge-tools.diffmerge.dirdiff=**True
>> C:\Program Files\TortoiseHg\hgrc.d\**MergeTools.rc:91:
>> merge-tools.diffmerge3.**dirdiff=True
>> C:\Program Files\TortoiseHg\hgrc.d\**MergeTools.rc:102:
>> merge-tools.p4merge.dirdiff=**False
>> C:\Program Files\TortoiseHg\hgrc.d\**MergeTools.rc:120:
>> merge-tools.ecmerge.dirdiff=**True
>> C:\Program Files\TortoiseHg\hgrc.d\**MergeTools.rc:133:
>> merge-tools.winmergeu.dirdiff=**True
>> C:\Program Files\TortoiseHg\hgrc.d\**MergeTools.rc:152:
>> merge-tools.rekisa.dirdiff=**False
>> C:\Program Files\TortoiseHg\hgrc.d\**MergeTools.rc:161:
>> merge-tools.bcompare.dirdiff=**True
>> C:\Program Files\TortoiseHg\hgrc.d\**MergeTools.rc:168:
>> merge-tools.meld.dirdiff=True
>> C:\Program Files\TortoiseHg\hgrc.d\**MergeTools.rc:175:
>> merge-tools.diffuse.dirdiff=**False
>> C:\Program Files\TortoiseHg\hgrc.d\**MergeTools.rc:182:
>> merge-tools.xxdiff.dirdiff=**True
>> C:\Program Files\TortoiseHg\hgrc.d\**MergeTools.rc:189:
>> merge-tools.tkdiff.dirdiff=**False
>>
>
> Hmm, I cannot see any problem...
> Could you attach the whole output of 'hg debugconfig --debug', preferably
> executed from "Output Log" widget of TortoiseHg?
> (mask private settings like password if any)
>
>
> On 1 June 2012 12:22, Yuya Nishihara<y...@tcha.org> wrote:
>>
>>> On 06/01/12 05:43, Luiz Carlos Costa Junior wrote:
>>>
>>>> Every time I update TortoiseHg and use it for the first time, it loads
>>>>
>>> the
>>>
>>>> kdiff tool perfectly when I double-click a changed file in the panel
>>>> that
>>>> shows the working directory.
>>>>
>>>> However, if I close and reopen TortoiseHg and double-click a changed
>>>> file
>>>> again it shows a different screen with:
>>>> Title: "Visual Diffs: working changes filtered"
>>>> Message: "Temporary files are removed when this dialog is closed."
>>>>
>>>
> Is there any difference on how to start TortoiseHg?
>
> Regards,
>
>
> Is it supposed to be like this or is it a bug?
>>>> How can I get kdiff as in the first time always?
>>>>
>>>
>>> Perhaps, somehow it loads wrong mergetools setting.
>>> Could you provide the output of 'hg debugconfig' command?
>>>
>>> example:
>>> % hg debugconfig --debug | grep dirdiff
>>> /etc/mercurial/hgrc.d/thg-**mergetools.rc:11:
>>> merge-tools.beyondcompare3.**dirdiff=True
>>> /etc/mercurial/hgrc.d/thg-**mergetools.rc:20:
>>> merge-tools.beyondcompare2.**dirdiff=True
>>> ...
>>> (dirdiff=True denotes the capability of directory diff)
>>>
>>
read config from: C:\Program Files\TortoiseHg\hgrc.d\Mercurial.rc
read config from: C:\Program Files\TortoiseHg\hgrc.d\MergePatterns.rc
read config from: C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc
read config from: C:\Program Files\TortoiseHg\hgrc.d\Paths.rc
read config from: C:\Users\**********\mercurial.ini
read config from: C:\Users\**********\.hgrc
read config from: C:\Users\**********\mercurial.ini
read config from: C:\Users\**********\.hgrc
C:\Program Files\TortoiseHg\hgrc.d\MergePatterns.rc:15:
diff-patterns.**.doc=docdiff
C:\Program Files\TortoiseHg\hgrc.d\MergePatterns.rc:16:
diff-patterns.**.docx=docdiff
C:\Program Files\TortoiseHg\hgrc.d\MergePatterns.rc:17:
diff-patterns.**.docm=docdiff
C:\Program Files\TortoiseHg\hgrc.d\MergePatterns.rc:18:
diff-patterns.**.ppt=docdiff
C:\Program Files\TortoiseHg\hgrc.d\MergePatterns.rc:19:
diff-patterns.**.pptx=docdiff
C:\Program Files\TortoiseHg\hgrc.d\MergePatterns.rc:20:
diff-patterns.**.pptm=docdiff
C:\Program Files\TortoiseHg\hgrc.d\MergePatterns.rc:21:
diff-patterns.**.xls=docdiff
C:\Program Files\TortoiseHg\hgrc.d\MergePatterns.rc:22:
diff-patterns.**.xlsx=docdiff
C:\Program Files\TortoiseHg\hgrc.d\MergePatterns.rc:23:
diff-patterns.**.xlsm=docdiff
C:\Program Files\TortoiseHg\hgrc.d\MergePatterns.rc:24:
diff-patterns.**.xlsb=docdiff
C:\Program Files\TortoiseHg\hgrc.d\MergePatterns.rc:25:
diff-patterns.**.xlam=docdiff
C:\Program Files\TortoiseHg\hgrc.d\MergePatterns.rc:26:
diff-patterns.**.ods=docdiff
C:\Program Files\TortoiseHg\hgrc.d\MergePatterns.rc:27:
diff-patterns.**.odt=docdiff
C:\Program Files\TortoiseHg\hgrc.d\MergePatterns.rc:28:
diff-patterns.**.sxw=docdiff
C:\Program Files\TortoiseHg\hgrc.d\MergePatterns.rc:29:
diff-patterns.**.nb=docdiff
C:\Program Files\TortoiseHg\hgrc.d\MergePatterns.rc:2:
merge-patterns.**.doc=docdiff
C:\Program Files\TortoiseHg\hgrc.d\MergePatterns.rc:3:
merge-patterns.**.docx=docdiff
C:\Program Files\TortoiseHg\hgrc.d\MergePatterns.rc:4:
merge-patterns.**.docm=docdiff
C:\Program Files\TortoiseHg\hgrc.d\MergePatterns.rc:5:
merge-patterns.**.ods=docdiff
C:\Program Files\TortoiseHg\hgrc.d\MergePatterns.rc:6:
merge-patterns.**.odt=docdiff
C:\Program Files\TortoiseHg\hgrc.d\MergePatterns.rc:7:
merge-patterns.**.sxw=docdiff
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:3:
merge-tools.beyondcompare3.priority=-1
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:4:
merge-tools.beyondcompare3.args=$local $other $base /mergeoutput=$output /ro
/lefttitle=parent1 /centertitle=base /righttitle=parent2 /outputtitle=merged
/automerge /reviewconflicts /solo
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:5:
merge-tools.beyondcompare3.premerge=False
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:6:
merge-tools.beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:7:
merge-tools.beyondcompare3.regkeyalt=Software\Wow6432Node\Scooter
Software\Beyond Compare 3
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:8:
merge-tools.beyondcompare3.regname=ExePath
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:9:
merge-tools.beyondcompare3.gui=True
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:10:
merge-tools.beyondcompare3.diffargs=/lro /lefttitle='$plabel1'
/righttitle='$clabel' /solo /expandall $parent $child
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:11:
merge-tools.beyondcompare3.diff3args=$parent1 $parent2 $child
/lefttitle='$plabel1' /centertitle='$clabel' /righttitle='$plabel2' /solo /ro
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:12:
merge-tools.beyondcompare3.dirdiff=True
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:15:
merge-tools.beyondcompare2.priority=-4
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:16:
merge-tools.beyondcompare2.args=/ro /title1="Original" /title2="Working copy"
$local $other
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:17:
merge-tools.beyondcompare2.regkey=Software\Scooter Software\Beyond Compare
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:18:
merge-tools.beyondcompare2.regkeyalt=Software\Wow6432Node\Scooter
Software\Beyond Compare
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:19:
merge-tools.beyondcompare2.regname=ExePath
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:20:
merge-tools.beyondcompare2.gui=True
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:21:
merge-tools.beyondcompare2.diffargs=/lro /title1='$plabel1' /title2='$clabel'
$parent $child
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:22:
merge-tools.beyondcompare2.dirdiff=True
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:35:
merge-tools.araxis.regkey=SOFTWARE\Classes\TypeLib\{46799e0a-7bd1-4330-911c-9660bb964ea2}\7.0\HELPDIR
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:36:
merge-tools.araxis.regappend=\ConsoleCompare.exe
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:37:
merge-tools.araxis.priority=-2
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:38: merge-tools.araxis.args=/3
/a2 /wait /merge /title1:"Parent 1" /title2:"Merge Result: "$output
/title3:"Parent 2" $local $base $other $output
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:39:
merge-tools.araxis.premerge=False
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:40:
merge-tools.araxis.checkconflict=True
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:41:
merge-tools.araxis.binary=True
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:42: merge-tools.araxis.gui=True
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:43:
merge-tools.araxis.diffargs=/2 /wait /title1:"$plabel1" /title2:"$clabel"
$parent $child
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:44:
merge-tools.araxis.diff3args=/3 /a2 /wait /title1:"$plabel1" /title2:"$clabel"
/title3:"$plabel2" $parent1 $child $parent2
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:45:
merge-tools.araxis.dirdiff=True
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:46:
merge-tools.araxis.dir3diff=True
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:48:
merge-tools.UltraCompare.regkey=Software\Microsoft\Windows\CurrentVersion\App
Paths\UC.exe
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:49:
merge-tools.UltraCompare.regkeyalt=Software\Wow6432Node\Microsoft\Windows\CurrentVersion\App
Paths\UC.exe
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:50:
merge-tools.UltraCompare.args=$base $local $other -title1 base -title3 other
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:51:
merge-tools.UltraCompare.priority=-2
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:52:
merge-tools.UltraCompare.gui=True
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:53:
merge-tools.UltraCompare.binary=True
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:54:
merge-tools.UltraCompare.checkconflicts=True
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:55:
merge-tools.UltraCompare.checkchanged=True
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:56:
merge-tools.UltraCompare.diffargs=$child $parent -title1 $clabel -title2
$plabel1
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:57:
merge-tools.UltraCompare.diff3args=$parent1 $child $parent2 -title1 $plabel1
-title2 $clabel -title3 $plabel2
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:59:
merge-tools.kdiff3.priority=-3
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:60:
merge-tools.kdiff3.args=--auto --L1 base --L2 parent1 --L3 parent2 $base $local
$other -o $output
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:61:
merge-tools.kdiff3.regkey=Software\KDiff3
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:62:
merge-tools.kdiff3.regkeyalt=Software\Wow6432Node\KDiff3
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:63:
merge-tools.kdiff3.regappend=\kdiff3.exe
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:64:
merge-tools.kdiff3.fixeol=False
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:65:
merge-tools.kdiff3.premerge=False
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:66: merge-tools.kdiff3.gui=True
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:67:
merge-tools.kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:68:
merge-tools.kdiff3.diff3args=--L1 '$plabel1' --L2 '$clabel' --L3 '$plabel2'
$parent1 $child $parent2
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:69:
merge-tools.kdiff3.dirdiff=True
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:71:
merge-tools.diffmerge.regkey=Software\SourceGear\SourceGear DiffMerge\
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:72:
merge-tools.diffmerge.regkeyalt=Software\Wow6432Node\SourceGear\SourceGear
DiffMerge\
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:73:
merge-tools.diffmerge.regname=Location
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:74:
merge-tools.diffmerge.priority=-7
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:75:
merge-tools.diffmerge.args=-nosplash -merge -title1=local -title2=merged
-title3=other $local $base $other -result=$output
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:76:
merge-tools.diffmerge.checkchanged=True
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:77:
merge-tools.diffmerge.gui=True
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:78:
merge-tools.diffmerge.diffargs=--nosplash --title1='$plabel1'
--title2='$clabel' $parent $child
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:79:
merge-tools.diffmerge.diff3args=--nosplash --title1='$plabel1'
--title2='$clabel' --title3='$plabel2' $parent1 $child $parent2
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:80:
merge-tools.diffmerge.dirdiff=True
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:82:
merge-tools.diffmerge3.regkey=Software\SourceGear\Common\DiffMerge\Installer
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:83:
merge-tools.diffmerge3.regkeyalt=Software\Wow6432Node\SourceGear\Common\DiffMerge\Installer
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:84:
merge-tools.diffmerge3.regname=Location
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:85:
merge-tools.diffmerge3.priority=-7
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:86:
merge-tools.diffmerge3.args=-nosplash -merge -title1=local -title2=merged
-title3=other $local $base $other -result=$output
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:87:
merge-tools.diffmerge3.checkchanged=True
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:88:
merge-tools.diffmerge3.gui=True
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:89:
merge-tools.diffmerge3.diffargs=--nosplash --title1='$plabel1'
--title2='$clabel' $parent $child
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:90:
merge-tools.diffmerge3.diff3args=--nosplash --title1='$plabel1'
--title2='$clabel' --title3='$plabel2' $parent1 $child $parent2
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:91:
merge-tools.diffmerge3.dirdiff=True
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:93:
merge-tools.p4merge.priority=-8
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:94:
merge-tools.p4merge.args=$base $local $other $output
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:95:
merge-tools.p4merge.regkey=Software\Perforce\Environment
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:96:
merge-tools.p4merge.regkeyalt=Software\Wow6432Node\Perforce\Environment
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:97:
merge-tools.p4merge.regname=P4INSTROOT
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:98:
merge-tools.p4merge.regappend=\p4merge.exe
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:99:
merge-tools.p4merge.gui=True
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:100:
merge-tools.p4merge.diffargs=$parent $child
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:101:
merge-tools.p4merge.diff3args=$child $parent1 $parent2
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:102:
merge-tools.p4merge.dirdiff=False
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:104:
merge-tools.tortoisemerge.priority=-9
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:105:
merge-tools.tortoisemerge.args=/base:$base /mine:$local /theirs:$other
/merged:$output
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:106:
merge-tools.tortoisemerge.regkey=Software\TortoiseSVN
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:107:
merge-tools.tortoisemerge.regkeyalt=Software\Wow6432Node\TortoiseSVN
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:108:
merge-tools.tortoisemerge.checkchanged=True
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:109:
merge-tools.tortoisemerge.gui=True
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:110:
merge-tools.tortoisemerge.diffargs=/base:$parent /mine:$child
/basename:'$plabel1' /minename:'$clabel'
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:113:
merge-tools.ecmerge.priority=-10
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:114:
merge-tools.ecmerge.args=$base $local $other --mode=merge3 --title0=base
--title1=local --title2=other --to=$output
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:115:
merge-tools.ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:116:
merge-tools.ecmerge.regkeyalt=Software\Wow6432Node\Elli\xc3\xa9 Computing\Merge
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:117:
merge-tools.ecmerge.gui=True
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:118:
merge-tools.ecmerge.diffargs=$parent $child --mode=diff2 --title1='$plabel1'
--title2='$clabel'
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:119:
merge-tools.ecmerge.diff3args=$child $parent1 $parent2 --mode=diff3
--title0='$clabel' --title1='$plabel1' --title2='$plabel2'
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:120:
merge-tools.ecmerge.dirdiff=True
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:121:
merge-tools.ecmerge.dir3diff=True
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:123:
merge-tools.winmergeu.regkey=Software\Thingamahoochie\WinMerge\
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:124:
merge-tools.winmergeu.regkeyalt=Software\Wow6432Node\Thingamahoochie\WinMerge\
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:125:
merge-tools.winmergeu.regname=Executable
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:126:
merge-tools.winmergeu.priority=-10
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:127:
merge-tools.winmergeu.args=/e /x /wl /ub /dl other /dr local $other $local
$output
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:128:
merge-tools.winmergeu.fixeol=True
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:129:
merge-tools.winmergeu.checkchanged=True
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:130:
merge-tools.winmergeu.gui=True
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:131:
merge-tools.winmergeu.diffargs=/r /e /x /ub /wl /dl '$plabel1' /dr '$clabel'
$parent $child
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:132:
merge-tools.winmergeu.diff3args=
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:133:
merge-tools.winmergeu.dirdiff=True
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:136:
merge-tools.docdiff.priority=-100
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:137:
merge-tools.docdiff.regkey=Software\TortoiseHg
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:138:
merge-tools.docdiff.regappend=\docdiff.exe
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:139:
merge-tools.docdiff.args=$local $base $other $output
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:140:
merge-tools.docdiff.gui=True
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:141:
merge-tools.docdiff.diffargs=$child $parent
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:142:
merge-tools.docdiff.diff3args=$parent1 $child $parent2 $child
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:144:
merge-tools.docdiff.usewin=True
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:147:
merge-tools.rekisa.priority=-1
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:148:
merge-tools.rekisa.args=-Title=Base "$base" -Title=Local "$local" -Title=Other
"$other"
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:149:
merge-tools.rekisa.gui=True
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:150:
merge-tools.rekisa.diffargs="-Title=$plabel1" "$parent" "-Title=$clabel"
"$child"
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:151:
merge-tools.rekisa.diff3args="-Title=$plabel1" "$parent1" "-Title=$clabel"
"$child" "-Title=$plabel2" "$parent2"
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:152:
merge-tools.rekisa.dirdiff=False
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:155:
merge-tools.bcompare.priority=-1
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:156:
merge-tools.bcompare.args=$local $other $base -mergeoutput=$output -ro
-lefttitle=parent1 -centertitle=base -righttitle=parent2 -outputtitle=merged
-automerge -reviewconflicts -solo
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:157:
merge-tools.bcompare.premerge=False
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:158:
merge-tools.bcompare.gui=True
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:159:
merge-tools.bcompare.diffargs=-lro -lefttitle='$plabel1' -righttitle='$clabel'
-solo -expandall $parent $child
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:160:
merge-tools.bcompare.diff3args=$parent1 $parent2 $child -lefttitle='$plabel1'
-centertitle='$clabel' -righttitle='$plabel2' -solo -expandall
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:161:
merge-tools.bcompare.dirdiff=True
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:163: merge-tools.meld.gui=True
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:164:
merge-tools.meld.args=--label='local' $local --label='base' $base
--label='other' $other
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:165:
merge-tools.meld.priority=-2
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:166:
merge-tools.meld.diffargs=-a --label='$plabel1' $parent --label='$clabel' $child
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:167:
merge-tools.meld.diff3args=-a --label='$plabel1' $parent1 --label='$clabel'
$child --label='$plabel2' $parent2
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:168:
merge-tools.meld.dirdiff=True
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:170:
merge-tools.diffuse.priority=-3
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:171:
merge-tools.diffuse.args=$local $base $other
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:172:
merge-tools.diffuse.gui=True
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:173:
merge-tools.diffuse.diffargs=$parent $child
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:174:
merge-tools.diffuse.diff3args=$parent1 $child $parent2
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:175:
merge-tools.diffuse.dirdiff=False
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:177:
merge-tools.xxdiff.priority=-4
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:178:
merge-tools.xxdiff.args=--show-merged-pane --exit-with-merge-status --title1
local --title2 base --title3 other --merged-filename $output --merge $local
$base $other
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:179:
merge-tools.xxdiff.gui=True
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:180:
merge-tools.xxdiff.diffargs=--title1 '$plabel1' $parent --title2 '$clabel'
$child
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:181:
merge-tools.xxdiff.diff3args=--title1 '$plabel1' $parent1 --title2 '$clabel'
$child --title3 '$plabel2' $parent2
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:182:
merge-tools.xxdiff.dirdiff=True
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:184:
merge-tools.tkdiff.args=-L local -L other $local $other -a $base -o $output
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:185:
merge-tools.tkdiff.gui=True
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:186:
merge-tools.tkdiff.priority=-5
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:187:
merge-tools.tkdiff.diffargs=-L '$plabel1' $parent -L '$clabel' $child
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:188:
merge-tools.tkdiff.diff3args=
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:189:
merge-tools.tkdiff.dirdiff=False
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:193:
merge-tools.rhapsody_diffmerge.regkey=Software\Telelogic\Rhapsody\DiffMerge\
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:194:
merge-tools.rhapsody_diffmerge.regkeyalt=Software\Wow6432Node\Telelogic\Rhapsody\DiffMerge\
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:195:
merge-tools.rhapsody_diffmerge.regname=Install Path
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:196:
merge-tools.rhapsody_diffmerge.priority=-110
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:197:
merge-tools.rhapsody_diffmerge.args=-xmerge $other $local -base $base -out
$output
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:198:
merge-tools.rhapsody_diffmerge.checkchanged=True
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:199:
merge-tools.rhapsody_diffmerge.gui=True
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:200:
merge-tools.rhapsody_diffmerge.diffargs=-xcompare $parent $child
C:\Program Files\TortoiseHg\hgrc.d\MergeTools.rc:201:
merge-tools.rhapsody_diffmerge.diff3args=
C:\Users\luizcarlos\mercurial.ini:2: tortoisehg.forcerepotab=True
C:\Program Files\TortoiseHg\hgrc.d\Mercurial.rc:23: ui.editor=notepad
C:\Program Files\TortoiseHg\hgrc.d\Mercurial.rc:26: ui.ssh="TortoisePlink.exe"
-ssh -2
C:\Users\luizcarlos\mercurial.ini:5: ui.username=****************
<****@***********>
none: ui.verbose=False
none: ui.debug=True
none: ui.quiet=False
C:\Program Files\TortoiseHg\hgrc.d\Paths.rc:2: web.cacerts=C:\Program
Files\TortoiseHg\hgrc.d\cacert.pem
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Tortoisehg-discuss mailing list
Tortoisehg-discuss@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
