|
88
|
1 ; System-wide Mercurial config file.
|
|
|
2 ;
|
|
|
3 ; !!! Do Not Edit This File !!!
|
|
|
4 ;
|
|
|
5 ; This file will be replaced by the installer on every upgrade.
|
|
|
6 ; Editing this file can cause strange side effects on Vista.
|
|
|
7 ;
|
|
|
8 ; http://bitbucket.org/tortoisehg/stable/issue/135
|
|
|
9 ;
|
|
|
10 ; To change settings you see in this file, override (or enable) them in
|
|
|
11 ; your user Mercurial.ini file, where USERNAME is your Windows user name:
|
|
|
12 ;
|
|
|
13 ; XP or older - C:\Documents and Settings\USERNAME\Mercurial.ini
|
|
|
14 ; Vista or later - C:\Users\USERNAME\Mercurial.ini
|
|
|
15
|
|
0
|
16
|
|
|
17 [ui]
|
|
88
|
18 ; editor used to enter commit logs, etc. Most text editors will work.
|
|
0
|
19 editor = notepad
|
|
88
|
20 ; show changed files and be a bit more verbose if True
|
|
|
21 ; verbose = True
|
|
|
22
|
|
|
23 ; username data to appear in commits
|
|
|
24 ; it usually takes the form: Joe User <joe.user@host.com>
|
|
|
25 ; username = Joe User <j.user@example.com>
|
|
0
|
26
|
|
88
|
27 ; In order to push/pull over ssh you must specify an ssh tool
|
|
|
28 ;ssh = "C:\Progra~1\TortoiseSVN\bin\TortoisePlink.exe" -ssh -2
|
|
|
29 ;ssh = C:\cygwin\bin\ssh
|
|
|
30
|
|
|
31 ;
|
|
|
32 ; For more information about mercurial extensions, start here
|
|
|
33 ; http://www.selenic.com/mercurial/wiki/index.cgi/UsingExtensions
|
|
|
34 ;
|
|
|
35 ; Extensions shipped with Mercurial
|
|
|
36 ;
|
|
0
|
37 [extensions]
|
|
88
|
38 ;acl =
|
|
|
39 ;alias =
|
|
|
40 ;bookmarks =
|
|
|
41 ;bugzilla =
|
|
|
42 ;children =
|
|
|
43 ;churn =
|
|
|
44 ;color =
|
|
|
45 ;convert =
|
|
|
46 ;extdiff =
|
|
|
47 ;fetch =
|
|
|
48 ;gpg =
|
|
|
49 ;graphlog =
|
|
|
50 ;hgcia =
|
|
|
51 ;hgk =
|
|
|
52 ;highlight =
|
|
|
53 ;interhg =
|
|
|
54 ;keyword =
|
|
|
55 ;mq =
|
|
|
56 ;notify =
|
|
|
57 ;pager =
|
|
|
58 ;parentrevspec =
|
|
|
59 ;patchbomb =
|
|
|
60 ;purge =
|
|
|
61 ;rebase =
|
|
|
62 ;record =
|
|
|
63 ;transplant =
|
|
|
64 ;win32mbcs =
|
|
|
65 ;win32text =
|
|
|
66 ;zeroconf =
|
|
0
|
67
|
|
88
|
68 ; To use cleverencode/cleverdecode, you must enable win32text extension
|
|
0
|
69
|
|
|
70 [encode]
|
|
|
71 ; Encode files that don't contain NUL characters.
|
|
|
72
|
|
|
73 ; ** = cleverencode:
|
|
|
74
|
|
|
75 ; Alternatively, you can explicitly specify each file extension that
|
|
|
76 ; you want encoded (any you omit will be left untouched), like this:
|
|
|
77
|
|
|
78 ; *.txt = dumbencode:
|
|
|
79
|
|
|
80
|
|
|
81 [decode]
|
|
|
82 ; Decode files that don't contain NUL characters.
|
|
|
83
|
|
|
84 ; ** = cleverdecode:
|
|
|
85
|
|
|
86 ; Alternatively, you can explicitly specify each file extension that
|
|
|
87 ; you want decoded (any you omit will be left untouched), like this:
|
|
|
88
|
|
|
89 ; **.txt = dumbdecode:
|
|
|
90
|
|
88
|
91 [patch]
|
|
|
92 ; If you enable win32text filtering, you will want to enable this
|
|
|
93 ; line as well to allow patching to work correctly.
|
|
|
94
|
|
|
95 ; eol = crlf
|
|
|
96
|
|
|
97
|
|
|
98 ;
|
|
|
99 ; Define external diff commands
|
|
|
100 ;
|
|
|
101 [extdiff]
|
|
|
102 ;cmd.bc3diff = C:\Program Files\Beyond Compare 3\BCompare.exe
|
|
|
103 ;cmd.vdiff = C:\Progra~1\TortoiseSVN\bin\TortoiseMerge.exe
|
|
|
104 ;cmd.vimdiff = gvim.exe
|
|
|
105 ;opts.vimdiff = -f '+next' '+execute "DirDiff ".argv(0)." ".argv(1)'
|
|
|
106
|
|
|
107
|
|
|
108 [hgk]
|
|
|
109 ; Replace the following with your path to hgk, uncomment it and
|
|
|
110 ; install ActiveTcl (or another win32 port like tclkit)
|
|
|
111 ; path="C:\Program Files\Mercurial\Contrib\hgk.tcl"
|
|
|
112 ; vdiff=vdiff
|
|
|
113
|
|
|
114
|
|
|
115 ;
|
|
|
116 ; The git extended diff format can represent binary files, file
|
|
|
117 ; permission changes, and rename information that the normal patch format
|
|
|
118 ; cannot describe. However it is also not compatible with tools which
|
|
|
119 ; expect normal patches. so enable git patches at your own risk.
|
|
|
120 ;
|
|
|
121 [diff]
|
|
|
122 ;git = false
|
|
|
123 ;nodates = false
|
|
|
124
|
|
0
|
125 # Some default global settings for common merge tools
|
|
|
126
|
|
|
127 [merge-tools]
|
|
|
128 kdiff3.args=--auto --L1 base --L2 local --L3 other $base $local $other -o $output
|
|
|
129 kdiff3.regkey=Software\KDiff3
|
|
|
130 kdiff3.regappend=\kdiff3.exe
|
|
|
131 kdiff3.fixeol=True
|
|
|
132 kdiff3.gui=True
|
|
|
133
|
|
|
134 gvimdiff.args=--nofork -d -g -O $local $other $base
|
|
|
135 gvimdiff.regkey=Software\Vim\GVim
|
|
|
136 gvimdiff.regname=path
|
|
|
137 gvimdiff.priority=-9
|
|
|
138
|
|
|
139 merge.checkconflicts=True
|
|
|
140 merge.priority=-10
|
|
|
141
|
|
|
142 gpyfm.gui=True
|
|
|
143
|
|
|
144 meld.gui=True
|
|
|
145
|
|
|
146 tkdiff.args=$local $other -a $base -o $output
|
|
|
147 tkdiff.gui=True
|
|
|
148 tkdiff.priority=-8
|
|
|
149
|
|
|
150 xxdiff.args=--show-merged-pane --exit-with-merge-status --title1 local --title2 base --title3 other --merged-filename $output --merge $local $base $other
|
|
|
151 xxdiff.gui=True
|
|
|
152 xxdiff.priority=-8
|
|
|
153
|
|
|
154 diffmerge.args=--nosplash --merge --title1=base --title2=local --title3=other $base $local $other
|
|
|
155 diffmerge.checkchanged=True
|
|
|
156 diffmerge.gui=True
|
|
|
157
|
|
|
158 p4merge.args=$base $local $other $output
|
|
|
159 p4merge.regkey=Software\Perforce\Environment
|
|
|
160 p4merge.regname=P4INSTROOT
|
|
|
161 p4merge.regappend=\p4merge.exe
|
|
|
162 p4merge.gui=True
|
|
|
163 p4merge.priority=-8
|
|
|
164
|
|
88
|
165 tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output
|
|
0
|
166 tortoisemerge.regkey=Software\TortoiseSVN
|
|
88
|
167 tortoisemerge.checkchanged=True
|
|
0
|
168 tortoisemerge.gui=True
|
|
|
169
|
|
|
170 ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --title2=other --to=$output
|
|
|
171 ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge
|
|
|
172 ecmerge.gui=True
|
|
|
173
|
|
88
|
174 filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
|
|
0
|
175 filemerge.args=-left $other -right $local -ancestor $base -merge $output
|
|
|
176 filemerge.gui=True
|
|
88
|
177
|
|
|
178 beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centertitle=base /righttitle=other /automerge /reviewconflicts /solo
|
|
|
179 beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3
|
|
|
180 beyondcompare3.regname=ExePath
|
|
|
181 beyondcompare3.gui=True
|
|
|
182
|
|
|
183 winmerge.args=/e /u /dl local /dr other /wr $local $other $output
|
|
|
184 winmerge.regkey=Software\Thingamahoochie\WinMerge
|
|
|
185 winmerge.regname=Executable
|
|
|
186 winmerge.checkchanged=True
|
|
|
187 winmerge.gui=True
|
