| changeset 5224 | 9cd6578750b9 |
| parent 2903 | 013921c753bd |
| 5220:2b8373bda032 | 5224:9cd6578750b9 |
|---|---|
32 |
32 |
33 echo % should succeed - 2 heads |
33 echo % should succeed - 2 heads |
34 hg merge |
34 hg merge |
35 hg commit -mm2 |
35 hg commit -mm2 |
36 |
36 |
37 echo % should fail because at tip |
|
38 hg merge |
|
39 |
|
40 hg up 0 |
|
37 echo % should fail because 1 head |
41 echo % should fail because 1 head |
38 hg merge |
42 hg merge |
39 |
43 |
40 true |
44 true |