mercurial/default.d/mergetools.rc
author Wagner Bruna <wbruna@softwareexpress.com.br>
Wed, 31 May 2017 19:24:00 -0300
branchstable
changeset 32574 870248603a4e
parent 26733 f6e2e42fb8ef
child 35908 a9802c9ecfb5
permissions -rw-r--r--
bugzilla: fix typo in help text
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
13566
a87a0fcb412f mergetools: add alternate registry keys for 32bit apps on 64bit O/S
Steve Borho <steve@borho.org>
parents: 11506
diff changeset
     6
kdiff3.regkeyalt=Software\Wow6432Node\KDiff3
6011
15a53af36a89 filemerge: two fixes for kdiff3 example configuration
Steve Borho <steve@borho.org>
parents: 6008
diff changeset
     7
kdiff3.regappend=\kdiff3.exe
15a53af36a89 filemerge: two fixes for kdiff3 example configuration
Steve Borho <steve@borho.org>
parents: 6008
diff changeset
     8
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
     9
kdiff3.gui=True
23968
6564ec382560 mergetools: drop incorrect quoting of diffargs variables
Mads Kiilerich <madski@unity3d.com>
parents: 23143
diff changeset
    10
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
    11
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    12
gvimdiff.args=--nofork -d -g -O $local $other $base
6014
2f424fc4edb3 mergetools: correct vim typo
Matt Mackall <mpm@selenic.com>
parents: 6011
diff changeset
    13
gvimdiff.regkey=Software\Vim\GVim
13566
a87a0fcb412f mergetools: add alternate registry keys for 32bit apps on 64bit O/S
Steve Borho <steve@borho.org>
parents: 11506
diff changeset
    14
gvimdiff.regkeyalt=Software\Wow6432Node\Vim\GVim
6008
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    15
gvimdiff.regname=path
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    16
gvimdiff.priority=-9
21875
33020e87f8c5 mergetools: add --nofork option to gvimdiff.diffargs for extdiff
Yuya Nishihara <yuya@tcha.org>
parents: 21632
diff changeset
    17
gvimdiff.diffargs=--nofork -d -g -O $parent $child
6008
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    18
18695
ec9b9968b7f8 mergetools: refine vimdiff warning message
Kevin Bullock <kbullock@ringworld.org>
parents: 18694
diff changeset
    19
vimdiff.args=$local $other $base -c 'redraw | echomsg "hg merge conflict, type \":cq\" to abort vimdiff"'
17422
93bc65e970c0 mergetools.hgrc: set vimdiff to check=changed
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 13566
diff changeset
    20
vimdiff.check=changed
11506
48e549d7c6ae mergetools.hgrc: add vimdiff
Martin Geisler <mg@lazybytes.net>
parents: 11308
diff changeset
    21
vimdiff.priority=-10
48e549d7c6ae mergetools.hgrc: add vimdiff
Martin Geisler <mg@lazybytes.net>
parents: 11308
diff changeset
    22
18385
bafbfe0b450c docs: "deprecate" checkchanged and checkconflicts in merge-tool configuration
Mads Kiilerich <madski@unity3d.com>
parents: 17422
diff changeset
    23
merge.check=conflicts
11147
bdc8f048166e give worst-case 'merge' merge-tool lowest priority
David Champion <dgc@uchicago.edu>
parents: 10486
diff changeset
    24
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
    25
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    26
gpyfm.gui=True
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    27
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    28
meld.gui=True
18972
3de9b1f9ebc3 mergetools: rename 'base' to 'merged' in meld
ronvoe12249 <ronny.voelker@elaxy.com>
parents: 18971
diff changeset
    29
meld.args=--label='local' $local --label='merged' $base --label='other' $other -o $output
18971
c4266e9afc4f mergetools: avoid losing the merged version with meld
ronvoe12249 <ronny.voelker@elaxy.com>
parents: 18695
diff changeset
    30
meld.check=changed
23968
6564ec382560 mergetools: drop incorrect quoting of diffargs variables
Mads Kiilerich <madski@unity3d.com>
parents: 23143
diff changeset
    31
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
    32
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    33
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
    34
tkdiff.gui=True
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    35
tkdiff.priority=-8
23968
6564ec382560 mergetools: drop incorrect quoting of diffargs variables
Mads Kiilerich <madski@unity3d.com>
parents: 23143
diff changeset
    36
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
    37
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    38
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
    39
xxdiff.gui=True
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    40
xxdiff.priority=-8
23968
6564ec382560 mergetools: drop incorrect quoting of diffargs variables
Mads Kiilerich <madski@unity3d.com>
parents: 23143
diff changeset
    41
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
    42
10486
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
    43
diffmerge.regkey=Software\SourceGear\SourceGear DiffMerge\
13566
a87a0fcb412f mergetools: add alternate registry keys for 32bit apps on 64bit O/S
Steve Borho <steve@borho.org>
parents: 11506
diff changeset
    44
diffmerge.regkeyalt=Software\Wow6432Node\SourceGear\SourceGear DiffMerge\
10486
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
    45
diffmerge.regname=Location
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
    46
diffmerge.priority=-7
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
    47
diffmerge.args=-nosplash -merge -title1=local -title2=merged -title3=other $local $base $other -result=$output
18385
bafbfe0b450c docs: "deprecate" checkchanged and checkconflicts in merge-tool configuration
Mads Kiilerich <madski@unity3d.com>
parents: 17422
diff changeset
    48
diffmerge.check=changed
6008
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    49
diffmerge.gui=True
23968
6564ec382560 mergetools: drop incorrect quoting of diffargs variables
Mads Kiilerich <madski@unity3d.com>
parents: 23143
diff changeset
    50
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
    51
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    52
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
    53
p4merge.regkey=Software\Perforce\Environment
13566
a87a0fcb412f mergetools: add alternate registry keys for 32bit apps on 64bit O/S
Steve Borho <steve@borho.org>
parents: 11506
diff changeset
    54
p4merge.regkeyalt=Software\Wow6432Node\Perforce\Environment
6008
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    55
p4merge.regname=P4INSTROOT
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    56
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
    57
p4merge.gui=True
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    58
p4merge.priority=-8
11184
7d99edddbaea extdiff: add labels, read diff arguments from [merge-tools]
Steve Borho <steve@borho.org>
parents: 11147
diff changeset
    59
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
    60
22461
864bc2f4279b contrib: add OS X p4merge to mergetools.hgrc
Mads Kiilerich <madski@unity3d.com>
parents: 21875
diff changeset
    61
p4mergeosx.executable = /Applications/p4merge.app/Contents/MacOS/p4merge
864bc2f4279b contrib: add OS X p4merge to mergetools.hgrc
Mads Kiilerich <madski@unity3d.com>
parents: 21875
diff changeset
    62
p4mergeosx.args = $base $local $other $output
864bc2f4279b contrib: add OS X p4merge to mergetools.hgrc
Mads Kiilerich <madski@unity3d.com>
parents: 21875
diff changeset
    63
p4mergeosx.gui = True
864bc2f4279b contrib: add OS X p4merge to mergetools.hgrc
Mads Kiilerich <madski@unity3d.com>
parents: 21875
diff changeset
    64
p4mergeosx.priority=-8
864bc2f4279b contrib: add OS X p4merge to mergetools.hgrc
Mads Kiilerich <madski@unity3d.com>
parents: 21875
diff changeset
    65
p4mergeosx.diffargs=$parent $child
864bc2f4279b contrib: add OS X p4merge to mergetools.hgrc
Mads Kiilerich <madski@unity3d.com>
parents: 21875
diff changeset
    66
7665
950484f05f16 Update win32 merge tools configuration
Pascal Quantin <pascal.quantin@gmail.com>
parents: 7385
diff changeset
    67
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
    68
tortoisemerge.regkey=Software\TortoiseSVN
13566
a87a0fcb412f mergetools: add alternate registry keys for 32bit apps on 64bit O/S
Steve Borho <steve@borho.org>
parents: 11506
diff changeset
    69
tortoisemerge.regkeyalt=Software\Wow6432Node\TortoiseSVN
18385
bafbfe0b450c docs: "deprecate" checkchanged and checkconflicts in merge-tool configuration
Mads Kiilerich <madski@unity3d.com>
parents: 17422
diff changeset
    70
tortoisemerge.check=changed
6008
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    71
tortoisemerge.gui=True
10486
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
    72
tortoisemerge.priority=-8
23968
6564ec382560 mergetools: drop incorrect quoting of diffargs variables
Mads Kiilerich <madski@unity3d.com>
parents: 23143
diff changeset
    73
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
    74
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    75
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
    76
ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge
13566
a87a0fcb412f mergetools: add alternate registry keys for 32bit apps on 64bit O/S
Steve Borho <steve@borho.org>
parents: 11506
diff changeset
    77
ecmerge.regkeyalt=Software\Wow6432Node\Elli\xc3\xa9 Computing\Merge
6008
33bfedc0be4a filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    78
ecmerge.gui=True
23968
6564ec382560 mergetools: drop incorrect quoting of diffargs variables
Mads Kiilerich <madski@unity3d.com>
parents: 23143
diff changeset
    79
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
    80
21632
3191d330302f mergetools.hgrc: add minimal configuration for editmerge
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21099
diff changeset
    81
# editmerge is a small script shipped in contrib.
3191d330302f mergetools.hgrc: add minimal configuration for editmerge
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21099
diff changeset
    82
# It needs this config otherwise it behaves the same as internal:local
3191d330302f mergetools.hgrc: add minimal configuration for editmerge
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21099
diff changeset
    83
editmerge.args=$output
3191d330302f mergetools.hgrc: add minimal configuration for editmerge
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21099
diff changeset
    84
editmerge.check=changed
3191d330302f mergetools.hgrc: add minimal configuration for editmerge
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21099
diff changeset
    85
editmerge.premerge=keep
3191d330302f mergetools.hgrc: add minimal configuration for editmerge
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21099
diff changeset
    86
7385
8119c1a607c4 mergetools: add pointer to the usual filemerge path
Brendan Cully <brendan@kublai.com>
parents: 6559
diff changeset
    87
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
    88
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
    89
filemerge.gui=True
7665
950484f05f16 Update win32 merge tools configuration
Pascal Quantin <pascal.quantin@gmail.com>
parents: 7385
diff changeset
    90
26733
f6e2e42fb8ef mergetools.rc: find OSX FileMerge in the new location inside Xcode 4.3
Mads Kiilerich <madski@unity3d.com>
parents: 24179
diff changeset
    91
filemergexcode.executable=/Applications/Xcode.app/Contents/Applications/FileMerge.app/Contents/MacOS/FileMerge
f6e2e42fb8ef mergetools.rc: find OSX FileMerge in the new location inside Xcode 4.3
Mads Kiilerich <madski@unity3d.com>
parents: 24179
diff changeset
    92
filemergexcode.args=-left $other -right $local -ancestor $base -merge $output
f6e2e42fb8ef mergetools.rc: find OSX FileMerge in the new location inside Xcode 4.3
Mads Kiilerich <madski@unity3d.com>
parents: 24179
diff changeset
    93
filemergexcode.gui=True
f6e2e42fb8ef mergetools.rc: find OSX FileMerge in the new location inside Xcode 4.3
Mads Kiilerich <madski@unity3d.com>
parents: 24179
diff changeset
    94
10486
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
    95
; 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
    96
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
    97
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
    98
beyondcompare3.regname=ExePath
7665
950484f05f16 Update win32 merge tools configuration
Pascal Quantin <pascal.quantin@gmail.com>
parents: 7385
diff changeset
    99
beyondcompare3.gui=True
10486
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
   100
beyondcompare3.priority=-2
23968
6564ec382560 mergetools: drop incorrect quoting of diffargs variables
Mads Kiilerich <madski@unity3d.com>
parents: 23143
diff changeset
   101
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
   102
10486
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
   103
; Linux version of Beyond Compare
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
   104
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
   105
bcompare.gui=True
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
   106
bcompare.priority=-1
23968
6564ec382560 mergetools: drop incorrect quoting of diffargs variables
Mads Kiilerich <madski@unity3d.com>
parents: 23143
diff changeset
   107
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
   108
24179
14d647d25c70 merge-tools: configuration for Beyond Compare on OS X
Mads Kiilerich <madski@unity3d.com>
parents: 23968
diff changeset
   109
; OS X version of Beyond Compare
14d647d25c70 merge-tools: configuration for Beyond Compare on OS X
Mads Kiilerich <madski@unity3d.com>
parents: 23968
diff changeset
   110
bcomposx.executable = /Applications/Beyond Compare.app/Contents/MacOS/bcomp
14d647d25c70 merge-tools: configuration for Beyond Compare on OS X
Mads Kiilerich <madski@unity3d.com>
parents: 23968
diff changeset
   111
bcomposx.args=$local $other $base -mergeoutput=$output -ro -lefttitle=parent1 -centertitle=base -righttitle=parent2 -outputtitle=merged -automerge -reviewconflicts -solo
14d647d25c70 merge-tools: configuration for Beyond Compare on OS X
Mads Kiilerich <madski@unity3d.com>
parents: 23968
diff changeset
   112
bcomposx.gui=True
14d647d25c70 merge-tools: configuration for Beyond Compare on OS X
Mads Kiilerich <madski@unity3d.com>
parents: 23968
diff changeset
   113
bcomposx.priority=-1
14d647d25c70 merge-tools: configuration for Beyond Compare on OS X
Mads Kiilerich <madski@unity3d.com>
parents: 23968
diff changeset
   114
bcomposx.diffargs=-lro -lefttitle=$plabel1 -righttitle=$clabel -solo -expandall $parent $child
14d647d25c70 merge-tools: configuration for Beyond Compare on OS X
Mads Kiilerich <madski@unity3d.com>
parents: 23968
diff changeset
   115
10486
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
   116
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
   117
winmerge.regkey=Software\Thingamahoochie\WinMerge
13566
a87a0fcb412f mergetools: add alternate registry keys for 32bit apps on 64bit O/S
Steve Borho <steve@borho.org>
parents: 11506
diff changeset
   118
winmerge.regkeyalt=Software\Wow6432Node\Thingamahoochie\WinMerge\
7665
950484f05f16 Update win32 merge tools configuration
Pascal Quantin <pascal.quantin@gmail.com>
parents: 7385
diff changeset
   119
winmerge.regname=Executable
18385
bafbfe0b450c docs: "deprecate" checkchanged and checkconflicts in merge-tool configuration
Mads Kiilerich <madski@unity3d.com>
parents: 17422
diff changeset
   120
winmerge.check=changed
7665
950484f05f16 Update win32 merge tools configuration
Pascal Quantin <pascal.quantin@gmail.com>
parents: 7385
diff changeset
   121
winmerge.gui=True
10486
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
   122
winmerge.priority=-10
23968
6564ec382560 mergetools: drop incorrect quoting of diffargs variables
Mads Kiilerich <madski@unity3d.com>
parents: 23143
diff changeset
   123
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
   124
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
   125
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
   126
araxis.regappend=\ConsoleCompare.exe
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
   127
araxis.priority=-2
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
   128
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
   129
araxis.checkconflict=True
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
   130
araxis.binary=True
6b354a763617 mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents: 7867
diff changeset
   131
araxis.gui=True
23968
6564ec382560 mergetools: drop incorrect quoting of diffargs variables
Mads Kiilerich <madski@unity3d.com>
parents: 23143
diff changeset
   132
araxis.diffargs=/2 /wait /title1:$plabel1 /title2:$clabel $parent $child
11184
7d99edddbaea extdiff: add labels, read diff arguments from [merge-tools]
Steve Borho <steve@borho.org>
parents: 11147
diff changeset
   133
7d99edddbaea extdiff: add labels, read diff arguments from [merge-tools]
Steve Borho <steve@borho.org>
parents: 11147
diff changeset
   134
diffuse.priority=-3
7d99edddbaea extdiff: add labels, read diff arguments from [merge-tools]
Steve Borho <steve@borho.org>
parents: 11147
diff changeset
   135
diffuse.args=$local $base $other
7d99edddbaea extdiff: add labels, read diff arguments from [merge-tools]
Steve Borho <steve@borho.org>
parents: 11147
diff changeset
   136
diffuse.gui=True
7d99edddbaea extdiff: add labels, read diff arguments from [merge-tools]
Steve Borho <steve@borho.org>
parents: 11147
diff changeset
   137
diffuse.diffargs=$parent $child
11308
16277f8aca1a mergetools: add configuration for Ultra Compare (issue2226)
Steve Borho <steve@borho.org>
parents: 11184
diff changeset
   138
16277f8aca1a mergetools: add configuration for Ultra Compare (issue2226)
Steve Borho <steve@borho.org>
parents: 11184
diff changeset
   139
UltraCompare.regkey=Software\Microsoft\Windows\CurrentVersion\App Paths\UC.exe
13566
a87a0fcb412f mergetools: add alternate registry keys for 32bit apps on 64bit O/S
Steve Borho <steve@borho.org>
parents: 11506
diff changeset
   140
UltraCompare.regkeyalt=Software\Wow6432Node\Microsoft\Windows\CurrentVersion\App Paths\UC.exe
11308
16277f8aca1a mergetools: add configuration for Ultra Compare (issue2226)
Steve Borho <steve@borho.org>
parents: 11184
diff changeset
   141
UltraCompare.args = $base $local $other -title1 base -title3 other
16277f8aca1a mergetools: add configuration for Ultra Compare (issue2226)
Steve Borho <steve@borho.org>
parents: 11184
diff changeset
   142
UltraCompare.priority = -2
16277f8aca1a mergetools: add configuration for Ultra Compare (issue2226)
Steve Borho <steve@borho.org>
parents: 11184
diff changeset
   143
UltraCompare.gui = True
16277f8aca1a mergetools: add configuration for Ultra Compare (issue2226)
Steve Borho <steve@borho.org>
parents: 11184
diff changeset
   144
UltraCompare.binary = True
18385
bafbfe0b450c docs: "deprecate" checkchanged and checkconflicts in merge-tool configuration
Mads Kiilerich <madski@unity3d.com>
parents: 17422
diff changeset
   145
UltraCompare.check = conflicts,changed
11308
16277f8aca1a mergetools: add configuration for Ultra Compare (issue2226)
Steve Borho <steve@borho.org>
parents: 11184
diff changeset
   146
UltraCompare.diffargs=$child $parent -title1 $clabel -title2 $plabel1