Can anyone help with this kdiff3 problem? On a conflict when merging, kdiff3 is appears, but the labels and the files shown are not as in the kdiff3.args (see below).
I've attached an shapshot of kdiff3's header and tried to reproduce how it looks below: A: C:\Temp\hgtest\src\CallMe.java B: c:\windows\temp\CallMe.java~base.rzq45e C: c:\windows\temp\CallMe.java~other.grnz9j I just reinstalled with the latest version from the web site (tortoisehg-1.1.1-hg-1.6.1023-x86.msi) but the problem persists. Any ideas? Any suggestion gratefully received. John hg showconfig --debug | grep kdiff3 C:\apps.win32\TortoiseHg\hgrc.d\MergeTools.rc:37: merge-tools.kdiff3.priority=-3 C:\apps.win32\TortoiseHg\hgrc.d\MergeTools.rc:38: merge-tools.kdiff3.args=--auto --L1 base --L2 parent1 --L3 parent2 $base $local $other -o $output C:\apps.win32\TortoiseHg\hgrc.d\MergeTools.rc:39: merge-tools.kdiff3.regkey=Software\KDiff3 C:\apps.win32\TortoiseHg\hgrc.d\MergeTools.rc:40: merge-tools.kdiff3.regappend=\kdiff3.exe C:\apps.win32\TortoiseHg\hgrc.d\MergeTools.rc:41: merge-tools.kdiff3.fixeol=True C:\apps.win32\TortoiseHg\hgrc.d\MergeTools.rc:42: merge-tools.kdiff3.premerge=False C:\apps.win32\TortoiseHg\hgrc.d\MergeTools.rc:43: merge-tools.kdiff3.gui=True C:\apps.win32\TortoiseHg\hgrc.d\MergeTools.rc:44: merge-tools.kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child C:\apps.win32\TortoiseHg\hgrc.d\MergeTools.rc:45: merge-tools.kdiff3.diff3args=--L1 '$plabel1' --L2 '$clabel' --L3 '$plabel2' $parent1 $child $parent2 C:\apps.win32\TortoiseHg\hgrc.d\MergeTools.rc:46: merge-tools.kdiff3.dirdiff=True
kdiff3header.png
Description: Binary data
STG12925
Description: Binary data
------------------------------------------------------------------------------ This SF.net email is sponsored by Sprint What will you do first with EVO, the first 4G phone? Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________ Tortoisehg-discuss mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
