igor@333: #!/bin/bash
igor@333: 
igor@333: hg init scam
igor@333: cd scam
igor@333: 
igor@333: #$ name: wife
igor@333: 
igor@333: cat > letter.txt <<EOF
igor@333: Greetings!
igor@333: 
igor@333: I am Mariam Abacha, the wife of former
igor@333: Nigerian dictator Sani Abacha.
igor@333: EOF
igor@333: 
igor@333: hg add letter.txt
igor@333: hg commit -m '419 scam, first draft'
igor@333: 
igor@333: #$ name: cousin
igor@333: 
igor@333: cd ..
igor@333: hg clone scam scam-cousin
igor@333: cd scam-cousin
igor@333: 
igor@333: cat > letter.txt <<EOF
igor@333: Greetings!
igor@333: 
igor@333: I am Shehu Musa Abacha, cousin to the former
igor@333: Nigerian dictator Sani Abacha.
igor@333: EOF
igor@333: 
igor@333: hg commit -m '419 scam, with cousin'
igor@333: 
igor@333: #$ name: son
igor@333: 
igor@333: cd ..
igor@333: hg clone scam scam-son
igor@333: cd scam-son
igor@333: 
igor@333: cat > letter.txt <<EOF
igor@333: Greetings!
igor@333: 
igor@333: I am Alhaji Abba Abacha, son of the former
igor@333: Nigerian dictator Sani Abacha.
igor@333: EOF
igor@333: 
igor@333: hg commit -m '419 scam, with son'
igor@333: 
igor@333: #$ name: pull
igor@333: 
igor@333: cd ..
igor@333: hg clone scam-cousin scam-merge
igor@333: cd scam-merge
igor@333: hg pull -u ../scam-son
igor@333: 
igor@333: #$ name: merge
igor@333: #$ ignore: [<>]{7} /tmp/.*
igor@333: 
igor@333: export HGMERGE=merge
igor@333: hg merge
igor@333: cat letter.txt
igor@333: 
igor@333: #$ name: commit
igor@333: 
igor@333: cat > letter.txt <<EOF
igor@333: Greetings!
igor@333: 
igor@333: I am Bryan O'Sullivan, no relation of the former
igor@333: Nigerian dictator Sani Abacha.
igor@333: EOF
igor@333: 
igor@333: hg resolve -m letter.txt
igor@333: hg commit -m 'Send me your money'
igor@333: hg tip