equal
deleted
inserted
replaced
21 hg merge |
21 hg merge |
22 cat .hg/branch |
22 cat .hg/branch |
23 HG_MERGE=true hg ci -m "merge" -d "0 0" |
23 HG_MERGE=true hg ci -m "merge" -d "0 0" |
24 hg log |
24 hg log |
25 |
25 |
26 |
26 echo % test for invalid branch cache |
|
27 hg rollback |
|
28 hg tip |