Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.0.1, 1.0.2, and 1.0.3

stable mergetools: disable premerge for kdiff3

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

Changeset c61160b75e0d…

Parent e479b15ff2c1…

by Steve Borho

Changes to one file · Browse files at c61160b75e0d Showing diff from parent e479b15ff2c1 Diff from another changeset...

Change 1 of 1 Show Entire File contrib/​mergetools.rc Stacked
 
30
31
32
 
33
34
35
 
30
31
32
33
34
35
36
@@ -30,6 +30,7 @@
 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