Mercurial > hg

comparison contrib/mergetools.hgrc @ 6011:15a53af36a89

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: two fixes for kdiff3 example configuration
author Steve Borho <steve@borho.org>
date Sun, 03 Feb 2008 22:27:53 -0600
parents 33bfedc0be4a
children 2f424fc4edb3
comparison
equal deleted inserted replaced
6010:83d193a513c8 6011:15a53af36a89
1 # Some default global settings for common merge tools 1 # Some default global settings for common merge tools
2 2
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
10 gvimdiff.regkey=Software\Vin\GVim 11 gvimdiff.regkey=Software\Vin\GVim
11 gvimdiff.regname=path 12 gvimdiff.regname=path