equal
deleted
inserted
replaced
1 -*- mode: outline; coding: utf-8 -*- |
1 -*- mode: outline; coding: utf-8 -*- |
2 |
2 |
3 * Useful customization. |
3 * Useful customization. |
|
4 |
|
5 Put to your ~/.hgrc: |
|
6 |
|
7 [ui] |
|
8 ; Editor for editing commit message. |
|
9 editor = gvim |
|
10 ; Who commit. |
|
11 username = Oleksandr Gavenko <gavenkoa@gmail.com> |
|
12 ; Use internal merge algorithm, which mark conflict like <<<<<< ====== >>>>>>. |
|
13 ; Save previous file version in '*.orig' file, after merge must be marked as |
|
14 ; resolved by running 'hg resolve -m <file>'. |
|
15 merge = internal:merge |
|
16 [web] |
|
17 ; Default encoding for file hosted by 'hg serv'. |
|
18 encoding = utf-8 |
4 |
19 |
5 ** Useful extension. |
20 ** Useful extension. |
6 |
21 |
7 Put to your ~/.hgrc: |
22 Put to your ~/.hgrc: |
8 |
23 |