equal
deleted
inserted
replaced
5 username = Oleksandr Gavenko <gavenkoa@gmail.com> |
5 username = Oleksandr Gavenko <gavenkoa@gmail.com> |
6 ; Use internal merge engine. When merge fail you see <<<<<< ====== >>>>>> and a .orig file. |
6 ; Use internal merge engine. When merge fail you see <<<<<< ====== >>>>>> and a .orig file. |
7 merge = internal:merge |
7 merge = internal:merge |
8 editor = emacs -q |
8 editor = emacs -q |
9 ignore = ~/.hgignore |
9 ignore = ~/.hgignore |
|
10 |
|
11 style = ~/.hgstyle |
10 |
12 |
11 [defaults] |
13 [defaults] |
12 log = -v -f |
14 log = -v -f |
13 incoming = -v |
15 incoming = -v |
14 outgoing = -v |
16 outgoing = -v |