Commits

Steve Borho committed c61160b

mergetools: disable premerge for kdiff3

kdiff3's automerge better handles mixed file encoding cases than hg's
internal simplemerge algorithm.

Comments (0)

Files changed (1)

contrib/mergetools.rc

 kdiff3.regkey=Software\KDiff3
 kdiff3.regappend=\kdiff3.exe
 kdiff3.fixeol=True
+kdiff3.premerge=False
 kdiff3.gui=True
 kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child
 kdiff3.diff3args=--L1 '$plabel1' --L2 '$clabel' --L3 '$plabel2' $parent1 $child $parent2