contrib/mergetools.hgrc
author Steve Borho <steve@borho.org>
Thu, 07 Jan 2010 22:19:05 -0600
changeset 11184 7d99edddbaea
parent 11147 bdc8f048166e
child 11308 16277f8aca1a
permissions -rw-r--r--
extdiff: add labels, read diff arguments from [merge-tools] hgtk has been using these same configs since Feb. Users only have to name the tools they would like to use, ex: [extdiff] kdiff3 = meld =
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
6008
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
     1
# Some default global settings for common merge tools
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
     2
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
     3
[merge-tools]
6559
8b67211d9140 mergetools.hgrc patch
Neal Becker <ndbecker2@gmail.com>
parents: 6075
diff changeset
     4
kdiff3.args=--auto --L1 base --L2 local --L3 other $base $local $other -o $output
6008
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
     5
kdiff3.regkey=Software\KDiff3
6011
15a53af36a89 filemerge: two fixes for kdiff3 example configuration
Steve Borho <steve@borho.org>
parents: 6008
diff changeset
     6
kdiff3.regappend=\kdiff3.exe
15a53af36a89 filemerge: two fixes for kdiff3 example configuration
Steve Borho <steve@borho.org>
parents: 6008
diff changeset
     7
kdiff3.fixeol=True
6008
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
     8
kdiff3.gui=True
11184
7d99edddbaea extdiff: add labels, read diff arguments from [merge-tools]
Steve Borho <steve@borho.org>
parents: 11147
diff changeset
     9
kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child
6008
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    10
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    11
gvimdiff.args=--nofork -d -g -O $local $other $base
6014
2f424fc4edb3 mergetools: correct vim typo
Matt Mackall <mpm@selenic.com>
parents: 6011
diff changeset
    12
gvimdiff.regkey=Software\Vim\GVim
6008
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    13
gvimdiff.regname=path
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    14
gvimdiff.priority=-9
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    15
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    16
merge.checkconflicts=True
11147
bdc8f048166e give worst-case 'merge' merge-tool lowest priority
David Champion <dgc@uchicago.edu>
parents: 10486
diff changeset
    17
merge.priority=-100
6008
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    18
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    19
gpyfm.gui=True
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    20
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    21
meld.gui=True
10486
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
    22
meld.args=--label='local' $local --label='base' $base --label='other' $other
11184
7d99edddbaea extdiff: add labels, read diff arguments from [merge-tools]
Steve Borho <steve@borho.org>
parents: 11147
diff changeset
    23
meld.diffargs=-a --label='$plabel1' $parent --label='$clabel' $child
6008
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    24
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    25
tkdiff.args=$local $other -a $base -o $output
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    26
tkdiff.gui=True
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    27
tkdiff.priority=-8
11184
7d99edddbaea extdiff: add labels, read diff arguments from [merge-tools]
Steve Borho <steve@borho.org>
parents: 11147
diff changeset
    28
tkdiff.diffargs=-L '$plabel1' $parent -L '$clabel' $child
6008
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    29
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    30
xxdiff.args=--show-merged-pane --exit-with-merge-status --title1 local --title2 base --title3 other --merged-filename $output --merge $local $base $other
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    31
xxdiff.gui=True
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    32
xxdiff.priority=-8
11184
7d99edddbaea extdiff: add labels, read diff arguments from [merge-tools]
Steve Borho <steve@borho.org>
parents: 11147
diff changeset
    33
xxdiff.diffargs=--title1 '$plabel1' $parent --title2 '$clabel' $child
6008
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    34
10486
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
    35
diffmerge.regkey=Software\SourceGear\SourceGear DiffMerge\
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
    36
diffmerge.regname=Location
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
    37
diffmerge.priority=-7
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
    38
diffmerge.args=-nosplash -merge -title1=local -title2=merged -title3=other $local $base $other -result=$output
6075
63e0e57ab157 filemerge: add 'checkchanged' merge tool property
Steve Borho <steve@borho.org>
parents: 6014
diff changeset
    39
diffmerge.checkchanged=True
6008
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    40
diffmerge.gui=True
11184
7d99edddbaea extdiff: add labels, read diff arguments from [merge-tools]
Steve Borho <steve@borho.org>
parents: 11147
diff changeset
    41
diffmerge.diffargs=--nosplash --title1='$plabel1' --title2='$clabel' $parent $child
6008
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    42
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    43
p4merge.args=$base $local $other $output
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    44
p4merge.regkey=Software\Perforce\Environment
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    45
p4merge.regname=P4INSTROOT
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    46
p4merge.regappend=\p4merge.exe
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    47
p4merge.gui=True
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    48
p4merge.priority=-8
11184
7d99edddbaea extdiff: add labels, read diff arguments from [merge-tools]
Steve Borho <steve@borho.org>
parents: 11147
diff changeset
    49
p4merge.diffargs=$parent $child
6008
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    50
7665
950484f05f16 Update win32 merge tools configuration
Pascal Quantin <pascal.quantin@gmail.com>
parents: 7385
diff changeset
    51
tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output
6008
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    52
tortoisemerge.regkey=Software\TortoiseSVN
7665
950484f05f16 Update win32 merge tools configuration
Pascal Quantin <pascal.quantin@gmail.com>
parents: 7385
diff changeset
    53
tortoisemerge.checkchanged=True
6008
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    54
tortoisemerge.gui=True
10486
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
    55
tortoisemerge.priority=-8
11184
7d99edddbaea extdiff: add labels, read diff arguments from [merge-tools]
Steve Borho <steve@borho.org>
parents: 11147
diff changeset
    56
tortoisemerge.diffargs=/base:$parent /mine:$child /basename:'$plabel1' /minename:'$clabel'
6008
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    57
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    58
ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --title2=other --to=$output
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    59
ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    60
ecmerge.gui=True
11184
7d99edddbaea extdiff: add labels, read diff arguments from [merge-tools]
Steve Borho <steve@borho.org>
parents: 11147
diff changeset
    61
ecmerge.diffargs=$parent $child --mode=diff2 --title1='$plabel1' --title2='$clabel'
6008
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    62
7385
8119c1a607c4 mergetools: add pointer to the usual filemerge path
Brendan Cully <brendan@kublai.com>
parents: 6559
diff changeset
    63
filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
6008
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    64
filemerge.args=-left $other -right $local -ancestor $base -merge $output
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    65
filemerge.gui=True
7665
950484f05f16 Update win32 merge tools configuration
Pascal Quantin <pascal.quantin@gmail.com>
parents: 7385
diff changeset
    66
10486
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
    67
; Windows version of Beyond Compare
7867
01bd0efef1b5 merge tools: fix typo in Beyond Compare's 3 command line
Pascal Quantin <pascal.quantin@gmail.com>
parents: 7797
diff changeset
    68
beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centertitle=base /righttitle=other /automerge /reviewconflicts /solo
7683
39ae4fb8cf17 Retrieve Beyond Compare's path from registry
Pascal Quantin <pascal.quantin@gmail.com>
parents: 7665
diff changeset
    69
beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3
39ae4fb8cf17 Retrieve Beyond Compare's path from registry
Pascal Quantin <pascal.quantin@gmail.com>
parents: 7665
diff changeset
    70
beyondcompare3.regname=ExePath
7665
950484f05f16 Update win32 merge tools configuration
Pascal Quantin <pascal.quantin@gmail.com>
parents: 7385
diff changeset
    71
beyondcompare3.gui=True
10486
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
    72
beyondcompare3.priority=-2
11184
7d99edddbaea extdiff: add labels, read diff arguments from [merge-tools]
Steve Borho <steve@borho.org>
parents: 11147
diff changeset
    73
beyondcompare3.diffargs=/lro /lefttitle='$plabel1' /righttitle='$clabel' /solo /expandall $parent $child
7665
950484f05f16 Update win32 merge tools configuration
Pascal Quantin <pascal.quantin@gmail.com>
parents: 7385
diff changeset
    74
10486
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
    75
; Linux version of Beyond Compare
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
    76
bcompare.args=$local $other $base -mergeoutput=$output -ro -lefttitle=parent1 -centertitle=base -righttitle=parent2 -outputtitle=merged -automerge -reviewconflicts -solo
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
    77
bcompare.premerge=False
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
    78
bcompare.gui=True
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
    79
bcompare.priority=-1
11184
7d99edddbaea extdiff: add labels, read diff arguments from [merge-tools]
Steve Borho <steve@borho.org>
parents: 11147
diff changeset
    80
bcompare.diffargs=-lro -lefttitle='$plabel1' -righttitle='$clabel' -solo -expandall $parent $child
10486
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
    81
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
    82
winmerge.args=/e /x /wl /ub /dl other /dr local $other $local $output
7665
950484f05f16 Update win32 merge tools configuration
Pascal Quantin <pascal.quantin@gmail.com>
parents: 7385
diff changeset
    83
winmerge.regkey=Software\Thingamahoochie\WinMerge
950484f05f16 Update win32 merge tools configuration
Pascal Quantin <pascal.quantin@gmail.com>
parents: 7385
diff changeset
    84
winmerge.regname=Executable
950484f05f16 Update win32 merge tools configuration
Pascal Quantin <pascal.quantin@gmail.com>
parents: 7385
diff changeset
    85
winmerge.checkchanged=True
950484f05f16 Update win32 merge tools configuration
Pascal Quantin <pascal.quantin@gmail.com>
parents: 7385
diff changeset
    86
winmerge.gui=True
10486
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
    87
winmerge.priority=-10
11184
7d99edddbaea extdiff: add labels, read diff arguments from [merge-tools]
Steve Borho <steve@borho.org>
parents: 11147
diff changeset
    88
winmerge.diffargs=/r /e /x /ub /wl /dl '$plabel1' /dr '$clabel' $parent $child
10486
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
    89
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
    90
araxis.regkey=SOFTWARE\Classes\TypeLib\{46799e0a-7bd1-4330-911c-9660bb964ea2}\7.0\HELPDIR
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
    91
araxis.regappend=\ConsoleCompare.exe
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
    92
araxis.priority=-2
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
    93
araxis.args=/3 /a2 /wait /merge /title1:"Other" /title2:"Base" /title3:"Local :"$local $other $base $local $output
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
    94
araxis.premerge=False
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
    95
araxis.checkconflict=True
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
    96
araxis.binary=True
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
    97
araxis.gui=True
11184
7d99edddbaea extdiff: add labels, read diff arguments from [merge-tools]
Steve Borho <steve@borho.org>
parents: 11147
diff changeset
    98
araxis.diffargs=/2 /wait /title1:"$plabel1" /title2:"$clabel" $parent $child
7d99edddbaea extdiff: add labels, read diff arguments from [merge-tools]
Steve Borho <steve@borho.org>
parents: 11147
diff changeset
    99
7d99edddbaea extdiff: add labels, read diff arguments from [merge-tools]
Steve Borho <steve@borho.org>
parents: 11147
diff changeset
   100
diffuse.priority=-3
7d99edddbaea extdiff: add labels, read diff arguments from [merge-tools]
Steve Borho <steve@borho.org>
parents: 11147
diff changeset
   101
diffuse.args=$local $base $other
7d99edddbaea extdiff: add labels, read diff arguments from [merge-tools]
Steve Borho <steve@borho.org>
parents: 11147
diff changeset
   102
diffuse.gui=True
7d99edddbaea extdiff: add labels, read diff arguments from [merge-tools]
Steve Borho <steve@borho.org>
parents: 11147
diff changeset
   103
diffuse.diffargs=$parent $child