| changeset 3853 | c0b449154a90 |
| parent 3295 | 764688cf51e5 |
| 3852:8a9a1a7e1698 | 3853:c0b449154a90 |
|---|---|
21 echo "merge" |
21 echo "merge" |
22 hg merge -y --debug |
22 hg merge -y --debug |
23 hg status -AC |
23 hg status -AC |
24 cat b |
24 cat b |
25 hg ci -m "merge" -d "0 0" |
25 hg ci -m "merge" -d "0 0" |
26 hg debugindex .hg/data/b.i |
26 hg debugindex .hg/store/data/b.i |
27 hg debugrename b |
27 hg debugrename b |