Show More
@@ -1,95 +1,93 b'' | |||||
1 | ; System-wide Mercurial config file. |
|
1 | ; System-wide Mercurial config file. | |
2 | ; |
|
2 | ; | |
3 | ; !!! Do Not Edit This File !!! |
|
3 | ; !!! Do Not Edit This File !!! | |
4 | ; |
|
4 | ; | |
5 | ; This file will be replaced by the installer on every upgrade. |
|
5 | ; This file will be replaced by the installer on every upgrade. | |
6 | ; Editing this file can cause strange side effects on Vista. |
|
6 | ; Editing this file can cause strange side effects on Vista. | |
7 | ; |
|
7 | ; | |
8 | ; http://bitbucket.org/tortoisehg/stable/issue/135 |
|
8 | ; http://bitbucket.org/tortoisehg/stable/issue/135 | |
9 | ; |
|
9 | ; | |
10 | ; To change settings you see in this file, override (or enable) them in |
|
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: |
|
11 | ; your user Mercurial.ini file, where USERNAME is your Windows user name: | |
12 | ; |
|
12 | ; | |
13 | ; XP or older - C:\Documents and Settings\USERNAME\Mercurial.ini |
|
13 | ; XP or older - C:\Documents and Settings\USERNAME\Mercurial.ini | |
14 | ; Vista or later - C:\Users\USERNAME\Mercurial.ini |
|
14 | ; Vista or later - C:\Users\USERNAME\Mercurial.ini | |
15 |
|
15 | |||
16 |
|
16 | |||
17 | [ui] |
|
17 | [ui] | |
18 | ; editor used to enter commit logs, etc. Most text editors will work. |
|
18 | ; editor used to enter commit logs, etc. Most text editors will work. | |
19 | editor = notepad |
|
19 | editor = notepad | |
20 | ; show changed files and be a bit more verbose if True |
|
20 | ; show changed files and be a bit more verbose if True | |
21 | ; verbose = True |
|
21 | ; verbose = True | |
22 |
|
22 | |||
23 | ; username data to appear in commits |
|
23 | ; username data to appear in commits | |
24 | ; it usually takes the form: Joe User <joe.user@host.com> |
|
24 | ; it usually takes the form: Joe User <joe.user@host.com> | |
25 | ; username = Joe User <j.user@example.com> |
|
25 | ; username = Joe User <j.user@example.com> | |
26 |
|
26 | |||
27 | ; In order to push/pull over ssh you must specify an ssh tool |
|
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 |
|
28 | ;ssh = "C:\Progra~1\TortoiseSVN\bin\TortoisePlink.exe" -ssh -2 | |
29 | ;ssh = C:\cygwin\bin\ssh |
|
29 | ;ssh = C:\cygwin\bin\ssh | |
30 |
|
30 | |||
31 | ; |
|
31 | ; | |
32 | ; For more information about mercurial extensions, start here |
|
32 | ; For more information about mercurial extensions, start here | |
33 | ; http://www.selenic.com/mercurial/wiki/index.cgi/UsingExtensions |
|
33 | ; http://www.selenic.com/mercurial/wiki/index.cgi/UsingExtensions | |
34 | ; |
|
34 | ; | |
35 | ; Extensions shipped with Mercurial |
|
35 | ; Extensions shipped with Mercurial | |
36 | ; |
|
36 | ; | |
37 | [extensions] |
|
37 | [extensions] | |
38 | ;acl = |
|
38 | ;acl = | |
39 | ;alias = |
|
39 | ;alias = | |
40 | ;bookmarks = |
|
|||
41 | ;bugzilla = |
|
40 | ;bugzilla = | |
42 | ;children = |
|
41 | ;children = | |
43 | ;churn = |
|
42 | ;churn = | |
44 | ;color = |
|
43 | ;color = | |
45 | ;convert = |
|
44 | ;convert = | |
46 | ;eol = |
|
45 | ;eol = | |
47 | ;extdiff = |
|
46 | ;extdiff = | |
48 | ;fetch = |
|
47 | ;fetch = | |
49 | ;gpg = |
|
48 | ;gpg = | |
50 | ;graphlog = |
|
49 | ;graphlog = | |
51 | ;hgcia = |
|
50 | ;hgcia = | |
52 | ;hgk = |
|
51 | ;hgk = | |
53 | ;highlight = |
|
52 | ;highlight = | |
54 | ;interhg = |
|
53 | ;interhg = | |
55 | ;keyword = |
|
54 | ;keyword = | |
56 | ;mq = |
|
55 | ;mq = | |
57 | ;notify = |
|
56 | ;notify = | |
58 | ;pager = |
|
57 | ;pager = | |
59 | ;parentrevspec = |
|
|||
60 | ;patchbomb = |
|
58 | ;patchbomb = | |
61 | ;progress = |
|
59 | ;progress = | |
62 | ;purge = |
|
60 | ;purge = | |
63 | ;rebase = |
|
61 | ;rebase = | |
64 | ;record = |
|
62 | ;record = | |
65 | ;transplant = |
|
63 | ;transplant = | |
66 | ;win32mbcs = |
|
64 | ;win32mbcs = | |
67 | ;zeroconf = |
|
65 | ;zeroconf = | |
68 |
|
66 | |||
69 | ; |
|
67 | ; | |
70 | ; Define external diff commands |
|
68 | ; Define external diff commands | |
71 | ; |
|
69 | ; | |
72 | [extdiff] |
|
70 | [extdiff] | |
73 | ;cmd.bc3diff = C:\Program Files\Beyond Compare 3\BCompare.exe |
|
71 | ;cmd.bc3diff = C:\Program Files\Beyond Compare 3\BCompare.exe | |
74 | ;cmd.vdiff = C:\Progra~1\TortoiseSVN\bin\TortoiseMerge.exe |
|
72 | ;cmd.vdiff = C:\Progra~1\TortoiseSVN\bin\TortoiseMerge.exe | |
75 | ;cmd.vimdiff = gvim.exe |
|
73 | ;cmd.vimdiff = gvim.exe | |
76 | ;opts.vimdiff = -f '+next' '+execute "DirDiff ".argv(0)." ".argv(1)' |
|
74 | ;opts.vimdiff = -f '+next' '+execute "DirDiff ".argv(0)." ".argv(1)' | |
77 |
|
75 | |||
78 |
|
76 | |||
79 | [hgk] |
|
77 | [hgk] | |
80 | ; Replace the following with your path to hgk, uncomment it and |
|
78 | ; Replace the following with your path to hgk, uncomment it and | |
81 | ; install ActiveTcl (or another win32 port like tclkit) |
|
79 | ; install ActiveTcl (or another win32 port like tclkit) | |
82 | ; path="C:\Program Files\Mercurial\Contrib\hgk.tcl" |
|
80 | ; path="C:\Program Files\Mercurial\Contrib\hgk.tcl" | |
83 | ; vdiff=vdiff |
|
81 | ; vdiff=vdiff | |
84 |
|
82 | |||
85 |
|
83 | |||
86 | ; |
|
84 | ; | |
87 | ; The git extended diff format can represent binary files, file |
|
85 | ; The git extended diff format can represent binary files, file | |
88 | ; permission changes, and rename information that the normal patch format |
|
86 | ; permission changes, and rename information that the normal patch format | |
89 | ; cannot describe. However it is also not compatible with tools which |
|
87 | ; cannot describe. However it is also not compatible with tools which | |
90 | ; expect normal patches. so enable git patches at your own risk. |
|
88 | ; expect normal patches. so enable git patches at your own risk. | |
91 | ; |
|
89 | ; | |
92 | [diff] |
|
90 | [diff] | |
93 | ;git = false |
|
91 | ;git = false | |
94 | ;nodates = false |
|
92 | ;nodates = false | |
95 |
|
93 |
General Comments 0
You need to be logged in to leave comments.
Login now