Mercurial > hg
annotate mercurial/defaultrc/mergetools.rc @ 46371:0903d6b9b1df
repository: introduce register_changeset callback
The new callback is called whenever a changeset is added to the repository
(commit, unbundle or exchange). Since the bulk operations already parse
the changeset (readfiles or full changesetrevision), always use the
latter to avoid redundant lookups. The first consumer of the new
interface needs to look at extra.
Differential Revision: https://phab.mercurial-scm.org/D9780
author | Joerg Sonnenberger <joerg@bec.de> |
---|---|
date | Tue, 19 Jan 2021 00:20:53 +0100 |
parents | dbc462e34e92 |
children | a6efc1f1a73b |
rev | line source |
---|---|
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] |
46168
24ee0c7e7fd2
mergetools: sync up comments with the TortoiseHg copy of the config file
Matt Harbison <matt_harbison@yahoo.com>
parents:
46124
diff
changeset
|
4 |
24ee0c7e7fd2
mergetools: sync up comments with the TortoiseHg copy of the config file
Matt Harbison <matt_harbison@yahoo.com>
parents:
46124
diff
changeset
|
5 ; The Araxis Merge tool is configured to work with newer versions of Araxis Merge |
24ee0c7e7fd2
mergetools: sync up comments with the TortoiseHg copy of the config file
Matt Harbison <matt_harbison@yahoo.com>
parents:
46124
diff
changeset
|
6 ; if you are using Araxis Merge 2008 or earlier, create a [merge-tools] section |
24ee0c7e7fd2
mergetools: sync up comments with the TortoiseHg copy of the config file
Matt Harbison <matt_harbison@yahoo.com>
parents:
46124
diff
changeset
|
7 ; in your mercurial.ini file, and add one of the two following "araxis.executable" |
24ee0c7e7fd2
mergetools: sync up comments with the TortoiseHg copy of the config file
Matt Harbison <matt_harbison@yahoo.com>
parents:
46124
diff
changeset
|
8 ; lines, depending on whether you have installed a 32 or a 64 bit version |
24ee0c7e7fd2
mergetools: sync up comments with the TortoiseHg copy of the config file
Matt Harbison <matt_harbison@yahoo.com>
parents:
46124
diff
changeset
|
9 ; of Araxis Merge and whether you are on a 32 or 64 bit version of windows |
24ee0c7e7fd2
mergetools: sync up comments with the TortoiseHg copy of the config file
Matt Harbison <matt_harbison@yahoo.com>
parents:
46124
diff
changeset
|
10 ; |
24ee0c7e7fd2
mergetools: sync up comments with the TortoiseHg copy of the config file
Matt Harbison <matt_harbison@yahoo.com>
parents:
46124
diff
changeset
|
11 ;araxis.executable=${ProgramFiles}/Araxis/Araxis Merge/ConsoleCompare.exe |
24ee0c7e7fd2
mergetools: sync up comments with the TortoiseHg copy of the config file
Matt Harbison <matt_harbison@yahoo.com>
parents:
46124
diff
changeset
|
12 ;araxis.executable=${ProgramFiles(x86)}/Araxis/Araxis Merge/ConsoleCompare.exe |
24ee0c7e7fd2
mergetools: sync up comments with the TortoiseHg copy of the config file
Matt Harbison <matt_harbison@yahoo.com>
parents:
46124
diff
changeset
|
13 ; |
24ee0c7e7fd2
mergetools: sync up comments with the TortoiseHg copy of the config file
Matt Harbison <matt_harbison@yahoo.com>
parents:
46124
diff
changeset
|
14 ; Please remember to remove the leading ";" to uncomment the line |
24ee0c7e7fd2
mergetools: sync up comments with the TortoiseHg copy of the config file
Matt Harbison <matt_harbison@yahoo.com>
parents:
46124
diff
changeset
|
15 ; |
46124
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
16 araxis.args=/3 /a2 /wait /merge /title1:"Other" /title2:"Base" /title3:"Local :"$local $other $base $local $output |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
17 araxis.binary=True |
46169
714085c1b800
mergetools: enable the `checkconflicts` option for Araxis Merge
Matt Harbison <matt_harbison@yahoo.com>
parents:
46168
diff
changeset
|
18 araxis.checkconflicts=True |
46124
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
19 araxis.diffargs=/2 /wait /title1:$plabel1 /title2:$clabel $parent $child |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
20 araxis.gui=True |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
21 araxis.priority=-2 |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
22 araxis.regappend=\ConsoleCompare.exe |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
23 araxis.regkey=SOFTWARE\Classes\TypeLib\{46799e0a-7bd1-4330-911c-9660bb964ea2}\7.0\HELPDIR |
6008
33bfedc0be4a
filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
24 |
46168
24ee0c7e7fd2
mergetools: sync up comments with the TortoiseHg copy of the config file
Matt Harbison <matt_harbison@yahoo.com>
parents:
46124
diff
changeset
|
25 ; Linux version of BeyondCompare 3 and 4 (dirdiff is version 4 only) |
46124
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
26 bcompare.args=$local $other $base -mergeoutput=$output -ro -lefttitle=$labellocal -centertitle=$labelbase -righttitle=$labelother -outputtitle=merged -automerge -reviewconflicts -solo |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
27 bcompare.diffargs=-lro -lefttitle=$plabel1 -righttitle=$clabel -solo -expandall $parent $child |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
28 bcompare.gui=True |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
29 bcompare.priority=-1 |
11506
48e549d7c6ae
mergetools.hgrc: add vimdiff
Martin Geisler <mg@lazybytes.net>
parents:
11308
diff
changeset
|
30 |
46124
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
31 ; OS X version of Beyond Compare |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
32 bcomposx.args=$local $other $base -mergeoutput=$output -ro -lefttitle=$labellocal -centertitle=$labelbase -righttitle=$labelother -outputtitle=merged -automerge -reviewconflicts -solo |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
33 bcomposx.diffargs=-lro -lefttitle=$plabel1 -righttitle=$clabel -solo -expandall $parent $child |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
34 bcomposx.executable = /Applications/Beyond Compare.app/Contents/MacOS/bcomp |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
35 bcomposx.gui=True |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
36 bcomposx.priority=-1 |
6008
33bfedc0be4a
filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
37 |
46168
24ee0c7e7fd2
mergetools: sync up comments with the TortoiseHg copy of the config file
Matt Harbison <matt_harbison@yahoo.com>
parents:
46124
diff
changeset
|
38 ; Windows version of BeyondCompare 3 |
46124
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
39 beyondcompare3.args=$local $other $base $output /ro /lefttitle=$labellocal /centertitle=$labelbase /righttitle=$labelother /automerge /reviewconflicts /solo |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
40 beyondcompare3.diffargs=/lro /lefttitle=$plabel1 /righttitle=$clabel /solo /expandall $parent $child |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
41 beyondcompare3.gui=True |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
42 beyondcompare3.priority=-2 |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
43 beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3 |
46170
968766c1a324
mergetools: add support for 32-bit BeyondCompare 3 on 64-bit Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
46169
diff
changeset
|
44 beyondcompare3.regkeyalt=Software\Wow6432Node\Scooter Software\Beyond Compare 3 |
46124
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
45 beyondcompare3.regname=ExePath |
6008
33bfedc0be4a
filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
46 |
46171
dbc462e34e92
mergetools: add BeyondCompare 4 for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
46170
diff
changeset
|
47 ; Windows version of BeyondCompare 4 |
dbc462e34e92
mergetools: add BeyondCompare 4 for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
46170
diff
changeset
|
48 beyondcompare4.args=$local $other $base /mergeoutput=$output /ro /lefttitle=$labellocal /centertitle=$labelbase /righttitle=$labelother /outputtitle=merged /automerge /reviewconflicts /solo |
dbc462e34e92
mergetools: add BeyondCompare 4 for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
46170
diff
changeset
|
49 beyondcompare4.diffargs=/lro /lefttitle=$plabel1 /righttitle=$clabel /solo /expandall $parent $child |
dbc462e34e92
mergetools: add BeyondCompare 4 for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
46170
diff
changeset
|
50 beyondcompare4.gui=True |
dbc462e34e92
mergetools: add BeyondCompare 4 for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
46170
diff
changeset
|
51 beyondcompare4.premerge=False |
dbc462e34e92
mergetools: add BeyondCompare 4 for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
46170
diff
changeset
|
52 beyondcompare4.priority=-1 |
dbc462e34e92
mergetools: add BeyondCompare 4 for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
46170
diff
changeset
|
53 beyondcompare4.regkey=Software\Scooter Software\Beyond Compare 4 |
dbc462e34e92
mergetools: add BeyondCompare 4 for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
46170
diff
changeset
|
54 beyondcompare4.regkeyalt=Software\Wow6432Node\Scooter Software\Beyond Compare 4 |
dbc462e34e92
mergetools: add BeyondCompare 4 for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
46170
diff
changeset
|
55 beyondcompare4.regname=ExePath |
dbc462e34e92
mergetools: add BeyondCompare 4 for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
46170
diff
changeset
|
56 |
46124
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
57 diffmerge.args=-nosplash -merge -title1=$labellocal -title2=merged -title3=$labelother $local $base $other -result=$output |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
58 diffmerge.check=changed |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
59 diffmerge.diffargs=--nosplash --title1=$plabel1 --title2=$clabel $parent $child |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
60 diffmerge.gui=True |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
61 diffmerge.priority=-7 |
10486
6b354a763617
mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents:
7867
diff
changeset
|
62 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
|
63 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
|
64 diffmerge.regname=Location |
6008
33bfedc0be4a
filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
65 |
46124
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
66 diffuse.args=$local $base $other |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
67 diffuse.diffargs=$parent $child |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
68 diffuse.gui=True |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
69 diffuse.priority=-3 |
6008
33bfedc0be4a
filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
70 |
35908
a9802c9ecfb5
merge: use operation-provided labels (ex: dest/source) in several merge-tools
Kyle Lippincott <spectral@google.com>
parents:
26733
diff
changeset
|
71 ecmerge.args=$base $local $other --mode=merge3 --title0=$labelbase --title1=$labellocal --title2=$labelother --to=$output |
46124
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
72 ecmerge.diffargs=$parent $child --mode=diff2 --title1=$plabel1 --title2=$clabel |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
73 ecmerge.gui=True |
6008
33bfedc0be4a
filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
74 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
|
75 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
|
76 |
21632
3191d330302f
mergetools.hgrc: add minimal configuration for editmerge
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21099
diff
changeset
|
77 # 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
|
78 # 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
|
79 editmerge.args=$output |
3191d330302f
mergetools.hgrc: add minimal configuration for editmerge
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21099
diff
changeset
|
80 editmerge.check=changed |
3191d330302f
mergetools.hgrc: add minimal configuration for editmerge
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21099
diff
changeset
|
81 editmerge.premerge=keep |
3191d330302f
mergetools.hgrc: add minimal configuration for editmerge
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21099
diff
changeset
|
82 |
46124
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
83 filemerge.args=-left $other -right $local -ancestor $base -merge $output |
7385
8119c1a607c4
mergetools: add pointer to the usual filemerge path
Brendan Cully <brendan@kublai.com>
parents:
6559
diff
changeset
|
84 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
|
85 filemerge.gui=True |
7665
950484f05f16
Update win32 merge tools configuration
Pascal Quantin <pascal.quantin@gmail.com>
parents:
7385
diff
changeset
|
86 |
46124
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
87 filemergexcode.args=-left $other -right $local -ancestor $base -merge $output |
26733
f6e2e42fb8ef
mergetools.rc: find OSX FileMerge in the new location inside Xcode 4.3
Mads Kiilerich <madski@unity3d.com>
parents:
24179
diff
changeset
|
88 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
|
89 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
|
90 |
46124
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
91 gpyfm.gui=True |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
92 |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
93 gvimdiff.args=--nofork -d -g -O $local $other $base |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
94 gvimdiff.diffargs=--nofork -d -g -O $parent $child |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
95 gvimdiff.priority=-9 |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
96 gvimdiff.regkey=Software\Vim\GVim |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
97 gvimdiff.regkeyalt=Software\Wow6432Node\Vim\GVim |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
98 gvimdiff.regname=path |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
99 |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
100 kdiff3.args=--auto --L1 $labelbase --L2 $labellocal --L3 $labelother $base $local $other -o $output |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
101 kdiff3.diffargs=--L1 $plabel1 --L2 $clabel $parent $child |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
102 kdiff3.fixeol=True |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
103 kdiff3.gui=True |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
104 kdiff3.regappend=\kdiff3.exe |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
105 kdiff3.regkey=Software\KDiff3 |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
106 kdiff3.regkeyalt=Software\Wow6432Node\KDiff3 |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
107 |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
108 meld.args=--label=$labellocal $local --label='merged' $base --label=$labelother $other -o $output --auto-merge |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
109 meld.check=changed |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
110 meld.diffargs=-a --label=$plabel1 $parent --label=$clabel $child |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
111 meld.gui=True |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
112 |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
113 merge.check=conflicts |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
114 merge.priority=-100 |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
115 |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
116 p4merge.args=$base $local $other $output |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
117 p4merge.diffargs=$parent $child |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
118 p4merge.gui=True |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
119 p4merge.priority=-8 |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
120 p4merge.regappend=\p4merge.exe |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
121 p4merge.regkey=Software\Perforce\Environment |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
122 p4merge.regkeyalt=Software\Wow6432Node\Perforce\Environment |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
123 p4merge.regname=P4INSTROOT |
7665
950484f05f16
Update win32 merge tools configuration
Pascal Quantin <pascal.quantin@gmail.com>
parents:
7385
diff
changeset
|
124 |
46124
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
125 p4mergeosx.args = $base $local $other $output |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
126 p4mergeosx.diffargs=$parent $child |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
127 p4mergeosx.executable = /Applications/p4merge.app/Contents/MacOS/p4merge |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
128 p4mergeosx.gui = True |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
129 p4mergeosx.priority=-8 |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
130 |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
131 tkdiff.args=$local $other -a $base -o $output |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
132 tkdiff.diffargs=-L $plabel1 $parent -L $clabel $child |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
133 tkdiff.gui=True |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
134 tkdiff.priority=-8 |
10486
6b354a763617
mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents:
7867
diff
changeset
|
135 |
46124
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
136 tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
137 tortoisemerge.check=changed |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
138 tortoisemerge.diffargs=/base:$parent /mine:$child /basename:$plabel1 /minename:$clabel |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
139 tortoisemerge.gui=True |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
140 tortoisemerge.priority=-8 |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
141 tortoisemerge.regkey=Software\TortoiseSVN |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
142 tortoisemerge.regkeyalt=Software\Wow6432Node\TortoiseSVN |
24179
14d647d25c70
merge-tools: configuration for Beyond Compare on OS X
Mads Kiilerich <madski@unity3d.com>
parents:
23968
diff
changeset
|
143 |
46124
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
144 UltraCompare.args = $base $local $other -title1 base -title3 other |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
145 UltraCompare.binary = True |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
146 UltraCompare.check = conflicts,changed |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
147 UltraCompare.diffargs=$child $parent -title1 $clabel -title2 $plabel1 |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
148 UltraCompare.gui = True |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
149 UltraCompare.priority = -2 |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
150 UltraCompare.regkey=Software\Microsoft\Windows\CurrentVersion\App Paths\UC.exe |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
151 UltraCompare.regkeyalt=Software\Wow6432Node\Microsoft\Windows\CurrentVersion\App Paths\UC.exe |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
152 |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
153 vimdiff.args=$local $other $base -c 'redraw | echomsg "hg merge conflict, type \":cq\" to abort vimdiff"' |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
154 vimdiff.check=changed |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
155 vimdiff.priority=-10 |
35908
a9802c9ecfb5
merge: use operation-provided labels (ex: dest/source) in several merge-tools
Kyle Lippincott <spectral@google.com>
parents:
26733
diff
changeset
|
156 winmerge.args=/e /x /wl /ub /dl $labelother /dr $labellocal $other $local $output |
46124
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
157 winmerge.check=changed |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
158 winmerge.diffargs=/r /e /x /ub /wl /dl $plabel1 /dr $clabel $parent $child |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
159 winmerge.gui=True |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
160 winmerge.priority=-10 |
7665
950484f05f16
Update win32 merge tools configuration
Pascal Quantin <pascal.quantin@gmail.com>
parents:
7385
diff
changeset
|
161 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
|
162 winmerge.regkeyalt=Software\Wow6432Node\Thingamahoochie\WinMerge\ |
7665
950484f05f16
Update win32 merge tools configuration
Pascal Quantin <pascal.quantin@gmail.com>
parents:
7385
diff
changeset
|
163 winmerge.regname=Executable |
10486
6b354a763617
mergetools: improve configuration for several merge tools
Steve Borho <steve@borho.org>
parents:
7867
diff
changeset
|
164 |
46124
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
165 xxdiff.args=--show-merged-pane --exit-with-merge-status --title1 $labellocal --title2 $labelbase --title3 $labelother --merged-filename $output --merge $local $base $other |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
166 xxdiff.diffargs=--title1 $plabel1 $parent --title2 $clabel $child |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
167 xxdiff.gui=True |
ceaf1646f420
mergetools: alphabetize the config settings
Matt Harbison <matt_harbison@yahoo.com>
parents:
43670
diff
changeset
|
168 xxdiff.priority=-8 |