| changeset 11797 | 66e4e8e8b1e5 |
| parent 11796 | 141e2e964705 |
| child 11798 | 1ab3d8977bdf |
| 11796:141e2e964705 | 11797:66e4e8e8b1e5 |
|---|---|
1 #!/bin/sh |
|
2 |
|
3 hg init |
|
4 echo "nothing" > a |
|
5 hg add a |
|
6 hg commit -m ancestor -d "1000000 0" |
|
7 echo "something" > a |
|
8 hg commit -m branch1 -d "1000000 0" |
|
9 hg co 0 |
|
10 echo "something else" > a |
|
11 hg commit -m branch2 -d "1000000 0" |
|
12 hg merge 1 |
|
13 hg id |
|
14 cat a |
|
15 hg status |