| changeset 42151 | 7116fc614cfc |
| parent 39715 | d8a7690ccc74 |
| child 47920 | 9c4204b7f3e4 |
| 42150:770f5f586ae5 | 42151:7116fc614cfc |
|---|---|
4 > [extensions] |
4 > [extensions] |
5 > fastannotate= |
5 > fastannotate= |
6 > [fastannotate] |
6 > [fastannotate] |
7 > mainbranch=@ |
7 > mainbranch=@ |
8 > EOF |
8 > EOF |
9 |
|
10 $ HGMERGE=true; export HGMERGE |
|
11 |
9 |
12 setup the server repo |
10 setup the server repo |
13 |
11 |
14 $ hg init repo-server |
12 $ hg init repo-server |
15 $ cd repo-server |
13 $ cd repo-server |