author | Wojciech Milkowski <wmilkowski@interia.pl> |
Wed, 04 Oct 2006 18:06:03 +0200 | |
changeset 3244 | f045b049a704 |
parent 3155 | c82ea81d6850 |
child 3257 | c93ce7f10f85 |
permissions | -rwxr-xr-x |
#!/bin/sh mkdir t cd t hg init echo foo > a echo foo > a2 hg add a a2 hg ci -m "start" -d "0 0" hg mv a b hg mv a2 b2 hg ci -m "rename" -d "0 0" echo "checkout" hg co 0 echo blahblah > a echo blahblah > a2 hg mv a2 c2 hg ci -m "modify" -d "0 0" echo "merge" hg merge -y --debug cat a cat b hg ci -m "merge" -d "0 0"