| branch | stable |
| changeset 12795 | 3cb0559e44d0 |
| parent 12793 | 469850088fc1 |
| parent 12794 | 6bf8d48bec8e |
| child 12796 | bc69ba99e34b |
| 12793:469850088fc1 | 12795:3cb0559e44d0 |
|---|---|
1 #!/bin/sh |
|
2 |
|
3 hg init |
|
4 echo This is file a1 > a |
|
5 hg add a |
|
6 hg commit -m "commit #0" -d "1000000 0" |
|
7 echo This is file b1 > b |
|
8 hg add b |
|
9 hg commit -m "commit #1" -d "1000000 0" |
|
10 hg update 0 |
|
11 echo This is file c1 > c |
|
12 hg add c |
|
13 hg commit -m "commit #2" -d "1000000 0" |
|
14 hg merge 1 |
|
15 rm b |
|
16 echo This is file c22 > c |
|
17 hg commit -m "commit #3" -d "1000000 0" |