1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/fr/examples/ch04/resolve	Tue Nov 24 15:52:19 2009 +0100
     1.3 @@ -0,0 +1,38 @@
     1.4 +#$ name: init
     1.5 +hg init conflict
     1.6 +cd conflict
     1.7 +echo first > myfile.txt
     1.8 +hg ci -A -m first
     1.9 +cd ..
    1.10 +hg clone conflict left
    1.11 +hg clone conflict right
    1.12 +
    1.13 +#$ name: left
    1.14 +cd left
    1.15 +echo left >> myfile.txt
    1.16 +hg ci -m left
    1.17 +
    1.18 +#$ name: right
    1.19 +cd ../right
    1.20 +echo right >> myfile.txt
    1.21 +hg ci -m right
    1.22 +
    1.23 +#$ name: pull
    1.24 +cd ../conflict
    1.25 +hg pull -u ../left
    1.26 +hg pull -u ../right
    1.27 +
    1.28 +#$ name: heads
    1.29 +hg heads
    1.30 +
    1.31 +#$ name: export
    1.32 +export HGMERGE=false
    1.33 +
    1.34 +#$ name: merge
    1.35 +hg merge
    1.36 +
    1.37 +#$ name: cifail
    1.38 +hg commit -m 'Attempt to commit a failed merge'
    1.39 +
    1.40 +#$ name: list
    1.41 +hg resolve -l