author | Oleksandr Gavenko <gavenkoa@gmail.com> |
Fri, 18 Feb 2011 16:47:17 +0200 | |
changeset 118 | 2306b12ff466 |
parent 111 | b89337474d09 |
child 132 | a2d359154fb7 |
permissions | -rw-r--r-- |
62
54e803acda8f
Set file encoding. Fix merge command. Added win32 enc/dec example.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
60
diff
changeset
|
1 |
; -*- mode: ini-generic; coding: utf-8 -*- |
54e803acda8f
Set file encoding. Fix merge command. Added win32 enc/dec example.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
60
diff
changeset
|
2 |
|
60 | 3 |
[ui] |
118
2306b12ff466
Add comments and remove 'win32text' extensions stuff.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
111
diff
changeset
|
4 |
; Who are you? |
60 | 5 |
username = Oleksandr Gavenko <gavenkoa@gmail.com> |
118
2306b12ff466
Add comments and remove 'win32text' extensions stuff.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
111
diff
changeset
|
6 |
; Use internal merge engine. When merge fail you see <<<<<< ====== >>>>>> and a .orig file. |
62
54e803acda8f
Set file encoding. Fix merge command. Added win32 enc/dec example.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
60
diff
changeset
|
7 |
merge = internal:merge |
54e803acda8f
Set file encoding. Fix merge command. Added win32 enc/dec example.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
60
diff
changeset
|
8 |
editor = emacs -q |
60 | 9 |
|
59 | 10 |
[defaults] |
11 |
log = -v |
|
12 |
incoming = -v |
|
13 |
outgoing = -v |
|
14 |
||
62
54e803acda8f
Set file encoding. Fix merge command. Added win32 enc/dec example.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
60
diff
changeset
|
15 |
[web] |
54e803acda8f
Set file encoding. Fix merge command. Added win32 enc/dec example.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
60
diff
changeset
|
16 |
encoding = utf-8 |
54e803acda8f
Set file encoding. Fix merge command. Added win32 enc/dec example.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
60
diff
changeset
|
17 |
|
59 | 18 |
[extensions] |
118
2306b12ff466
Add comments and remove 'win32text' extensions stuff.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
111
diff
changeset
|
19 |
; To allow 'fetch' command. |
59 | 20 |
hgext.fetch = |
118
2306b12ff466
Add comments and remove 'win32text' extensions stuff.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
111
diff
changeset
|
21 |
; To allow Mercurial Queues. |
62
54e803acda8f
Set file encoding. Fix merge command. Added win32 enc/dec example.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
60
diff
changeset
|
22 |
hgext.mq = |
118
2306b12ff466
Add comments and remove 'win32text' extensions stuff.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
111
diff
changeset
|
23 |
; To import revisions from foreign VCS repositories into Mercurial. |
102
f4b817fa0204
Enable convert Mercurial extension.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
62
diff
changeset
|
24 |
hgext.convert = |
111
b89337474d09
Enable Graph log extension.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
102
diff
changeset
|
25 |
; Usage: hg glog <dir> |
b89337474d09
Enable Graph log extension.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
102
diff
changeset
|
26 |
hgext.graphlog = |
118
2306b12ff466
Add comments and remove 'win32text' extensions stuff.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
111
diff
changeset
|
27 |
; Enable '.hgeol' tracking (fix for CR/LF). |
2306b12ff466
Add comments and remove 'win32text' extensions stuff.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
111
diff
changeset
|
28 |
hgext.eol = |
62
54e803acda8f
Set file encoding. Fix merge command. Added win32 enc/dec example.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
60
diff
changeset
|
29 |