| author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
| Sun, 17 May 2009 16:05:50 +0200 | |
| changeset 8474 | bccc90b56d02 |
| parent 7867 | 01bd0efef1b5 |
| child 10486 | 6b354a763617 |
| permissions | -rw-r--r-- |
|
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 | 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 |
|
33bfedc0be4a
filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
9 |
|
|
33bfedc0be4a
filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
10 |
gvimdiff.args=--nofork -d -g -O $local $other $base |
|
6014
2f424fc4edb3
mergetools: correct vim typo
Matt Mackall <mpm@selenic.com>
parents:
6011
diff
changeset
|
11 |
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
|
12 |
gvimdiff.regname=path |
|
33bfedc0be4a
filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
13 |
gvimdiff.priority=-9 |
|
33bfedc0be4a
filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
14 |
|
|
33bfedc0be4a
filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
15 |
merge.checkconflicts=True |
|
33bfedc0be4a
filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
16 |
merge.priority=-10 |
|
33bfedc0be4a
filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
17 |
|
|
33bfedc0be4a
filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
18 |
gpyfm.gui=True |
|
33bfedc0be4a
filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
19 |
|
|
33bfedc0be4a
filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
20 |
meld.gui=True |
|
33bfedc0be4a
filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
21 |
|
|
33bfedc0be4a
filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
22 |
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
|
23 |
tkdiff.gui=True |
|
33bfedc0be4a
filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
24 |
tkdiff.priority=-8 |
|
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 |
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
|
27 |
xxdiff.gui=True |
|
33bfedc0be4a
filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
28 |
xxdiff.priority=-8 |
|
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 |
diffmerge.args=--nosplash --merge --title1=base --title2=local --title3=other $base $local $other |
|
6075
63e0e57ab157
filemerge: add 'checkchanged' merge tool property
Steve Borho <steve@borho.org>
parents:
6014
diff
changeset
|
31 |
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
|
32 |
diffmerge.gui=True |
|
33bfedc0be4a
filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
33 |
|
|
33bfedc0be4a
filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
34 |
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
|
35 |
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
|
36 |
p4merge.regname=P4INSTROOT |
|
33bfedc0be4a
filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
37 |
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
|
38 |
p4merge.gui=True |
|
33bfedc0be4a
filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
39 |
p4merge.priority=-8 |
|
33bfedc0be4a
filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
40 |
|
|
7665
950484f05f16
Update win32 merge tools configuration
Pascal Quantin <pascal.quantin@gmail.com>
parents:
7385
diff
changeset
|
41 |
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
|
42 |
tortoisemerge.regkey=Software\TortoiseSVN |
|
7665
950484f05f16
Update win32 merge tools configuration
Pascal Quantin <pascal.quantin@gmail.com>
parents:
7385
diff
changeset
|
43 |
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
|
44 |
tortoisemerge.gui=True |
|
33bfedc0be4a
filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
45 |
|
|
33bfedc0be4a
filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
46 |
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
|
47 |
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
|
48 |
ecmerge.gui=True |
|
33bfedc0be4a
filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
49 |
|
|
7385
8119c1a607c4
mergetools: add pointer to the usual filemerge path
Brendan Cully <brendan@kublai.com>
parents:
6559
diff
changeset
|
50 |
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
|
51 |
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
|
52 |
filemerge.gui=True |
|
7665
950484f05f16
Update win32 merge tools configuration
Pascal Quantin <pascal.quantin@gmail.com>
parents:
7385
diff
changeset
|
53 |
|
|
7867
01bd0efef1b5
merge tools: fix typo in Beyond Compare's 3 command line
Pascal Quantin <pascal.quantin@gmail.com>
parents:
7797
diff
changeset
|
54 |
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
|
55 |
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
|
56 |
beyondcompare3.regname=ExePath |
|
7665
950484f05f16
Update win32 merge tools configuration
Pascal Quantin <pascal.quantin@gmail.com>
parents:
7385
diff
changeset
|
57 |
beyondcompare3.gui=True |
|
950484f05f16
Update win32 merge tools configuration
Pascal Quantin <pascal.quantin@gmail.com>
parents:
7385
diff
changeset
|
58 |
|
|
950484f05f16
Update win32 merge tools configuration
Pascal Quantin <pascal.quantin@gmail.com>
parents:
7385
diff
changeset
|
59 |
winmerge.args=/e /u /dl local /dr other /wr $local $other $output |
|
950484f05f16
Update win32 merge tools configuration
Pascal Quantin <pascal.quantin@gmail.com>
parents:
7385
diff
changeset
|
60 |
winmerge.regkey=Software\Thingamahoochie\WinMerge |
|
950484f05f16
Update win32 merge tools configuration
Pascal Quantin <pascal.quantin@gmail.com>
parents:
7385
diff
changeset
|
61 |
winmerge.regname=Executable |
|
950484f05f16
Update win32 merge tools configuration
Pascal Quantin <pascal.quantin@gmail.com>
parents:
7385
diff
changeset
|
62 |
winmerge.checkchanged=True |
|
950484f05f16
Update win32 merge tools configuration
Pascal Quantin <pascal.quantin@gmail.com>
parents:
7385
diff
changeset
|
63 |
winmerge.gui=True |