1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/fr/examples/tour-merge-conflict	Sun Feb 08 21:48:00 2009 +0100
     1.3 @@ -0,0 +1,73 @@
     1.4 +#!/bin/bash
     1.5 +
     1.6 +hg init scam
     1.7 +cd scam
     1.8 +
     1.9 +#$ name: wife
    1.10 +
    1.11 +cat > letter.txt <<EOF
    1.12 +Greetings!
    1.13 +
    1.14 +I am Mariam Abacha, the wife of former
    1.15 +Nigerian dictator Sani Abacha.
    1.16 +EOF
    1.17 +
    1.18 +hg add letter.txt
    1.19 +hg commit -m '419 scam, first draft'
    1.20 +
    1.21 +#$ name: cousin
    1.22 +
    1.23 +cd ..
    1.24 +hg clone scam scam-cousin
    1.25 +cd scam-cousin
    1.26 +
    1.27 +cat > letter.txt <<EOF
    1.28 +Greetings!
    1.29 +
    1.30 +I am Shehu Musa Abacha, cousin to the former
    1.31 +Nigerian dictator Sani Abacha.
    1.32 +EOF
    1.33 +
    1.34 +hg commit -m '419 scam, with cousin'
    1.35 +
    1.36 +#$ name: son
    1.37 +
    1.38 +cd ..
    1.39 +hg clone scam scam-son
    1.40 +cd scam-son
    1.41 +
    1.42 +cat > letter.txt <<EOF
    1.43 +Greetings!
    1.44 +
    1.45 +I am Alhaji Abba Abacha, son of the former
    1.46 +Nigerian dictator Sani Abacha.
    1.47 +EOF
    1.48 +
    1.49 +hg commit -m '419 scam, with son'
    1.50 +
    1.51 +#$ name: pull
    1.52 +
    1.53 +cd ..
    1.54 +hg clone scam-cousin scam-merge
    1.55 +cd scam-merge
    1.56 +hg pull -u ../scam-son
    1.57 +
    1.58 +#$ name: merge
    1.59 +#$ ignore: [<>]{7} /tmp/.*
    1.60 +
    1.61 +export HGMERGE=merge
    1.62 +hg merge
    1.63 +cat letter.txt
    1.64 +
    1.65 +#$ name: commit
    1.66 +
    1.67 +cat > letter.txt <<EOF
    1.68 +Greetings!
    1.69 +
    1.70 +I am Bryan O'Sullivan, no relation of the former
    1.71 +Nigerian dictator Sani Abacha.
    1.72 +EOF
    1.73 +
    1.74 +hg resolve -m letter.txt
    1.75 +hg commit -m 'Send me your money'
    1.76 +hg tip