| changeset 2283 | e506c14382fd |
| parent 1986 | 719cf07b076d |
| child 2320 | dbdce3b99988 |
| 2282:2efa636eb411 | 2283:e506c14382fd |
|---|---|
25 hg status |
25 hg status |
26 echo 1 > b |
26 echo 1 > b |
27 hg add b |
27 hg add b |
28 hg commit -m "branch" -d "1000000 0" |
28 hg commit -m "branch" -d "1000000 0" |
29 hg id |
29 hg id |
30 hg co -m 1 |
30 hg merge 1 |
31 hg id |
31 hg id |
32 hg status |
32 hg status |
33 |
33 |
34 hg commit -m "merge" -d "1000000 0" |
34 hg commit -m "merge" -d "1000000 0" |
35 # invalid tags |
35 # invalid tags |