1 2 3 4 5 6 7 8 9
set -e -x hg update trollius hg pull --update hg update default hg pull https://code.google.com/p/tulip/ hg update hg update trollius hg merge default echo "Now fix merge conflicts"