| branch | stable |
| changeset 10658 | 95c7c4b7e67a |
| parent 10505 | b3311e26f94f |
| 10656:f6ee02933af9 | 10658:95c7c4b7e67a |
|---|---|
22 echo % should fail because not at a head |
22 echo % should fail because not at a head |
23 hg merge |
23 hg merge |
24 |
24 |
25 hg up |
25 hg up |
26 echo % should fail because \> 2 heads |
26 echo % should fail because \> 2 heads |
27 export HGMERGE=internal:other |
27 HGMERGE=internal:other; export HGMERGE |
28 hg merge |
28 hg merge |
29 |
29 |
30 echo % should succeed |
30 echo % should succeed |
31 hg merge 2 |
31 hg merge 2 |
32 hg commit -mm1 |
32 hg commit -mm1 |