| changeset 10355 | a5576908b589 |
| parent 8834 | 6d36fc70754e |
| child 10504 | d2c1fc440533 |
| 10354:844d83da2da9 | 10355:a5576908b589 |
|---|---|
40 |
40 |
41 hg up 0 |
41 hg up 0 |
42 echo % should fail because 1 head |
42 echo % should fail because 1 head |
43 hg merge |
43 hg merge |
44 |
44 |
45 hg up 3 |
|
46 echo a >> a |
|
47 hg branch foobranch |
|
48 hg commit -mf |
|
49 echo % should fail because merge with other branch |
|
50 hg merge |
|
51 |
|
45 true |
52 true |