Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.9, 0.9.1, and 0.9.1.1

stable ini: enable 3-way diffs with kdiff3 in default config

Changeset 5362f54c8e8b…

Parent d8404435580d…

by Steve Borho

Changes to one file · Browse files at 5362f54c8e8b Showing diff from parent d8404435580d Diff from another changeset...

Change 1 of 1 Show Entire File contrib/​win32/​mercurial.ini Stacked
 
141
142
143
 
144
145
146
 
141
142
143
144
145
146
147
@@ -141,6 +141,7 @@
 ;  [extdiff]  cmd.vdiff = {app}\kdiff3 +opts.vdiff = $parent1 $child $parent2  ;cmd.bc3diff = C:\Program Files\Beyond Compare 3\BCompare.exe  ;cmd.vdiff = C:\Progra~1\TortoiseSVN\bin\TortoiseMerge.exe  ;cmd.vimdiff = gvim.exe