##// END OF EJS Templates
filemerge: two fixes for kdiff3 example configuration
Steve Borho -
r6011:15a53af3 default
parent child Browse files
Show More
@@ -3,7 +3,8 b''
3 [merge-tools]
3 [merge-tools]
4 kdiff3.args=--auto -L1 base --L2 local --L3 other $base $local $other -o $output
4 kdiff3.args=--auto -L1 base --L2 local --L3 other $base $local $other -o $output
5 kdiff3.regkey=Software\KDiff3
5 kdiff3.regkey=Software\KDiff3
6 kdiff3.append=\kdiff3.exe
6 kdiff3.regappend=\kdiff3.exe
7 kdiff3.fixeol=True
7 kdiff3.gui=True
8 kdiff3.gui=True
8
9
9 gvimdiff.args=--nofork -d -g -O $local $other $base
10 gvimdiff.args=--nofork -d -g -O $local $other $base
General Comments 0
You need to be logged in to leave comments. Login now