belaran@966: #$ name: init
belaran@966: hg init conflict
belaran@966: cd conflict
belaran@966: echo first > myfile.txt
belaran@966: hg ci -A -m first
belaran@966: cd ..
belaran@966: hg clone conflict left
belaran@966: hg clone conflict right
belaran@966: 
belaran@966: #$ name: left
belaran@966: cd left
belaran@966: echo left >> myfile.txt
belaran@966: hg ci -m left
belaran@966: 
belaran@966: #$ name: right
belaran@966: cd ../right
belaran@966: echo right >> myfile.txt
belaran@966: hg ci -m right
belaran@966: 
belaran@966: #$ name: pull
belaran@966: cd ../conflict
belaran@966: hg pull -u ../left
belaran@966: hg pull -u ../right
belaran@966: 
belaran@966: #$ name: heads
belaran@966: hg heads
belaran@966: 
belaran@966: #$ name: export
belaran@966: export HGMERGE=false
belaran@966: 
belaran@966: #$ name: merge
belaran@966: hg merge
belaran@966: 
belaran@966: #$ name: cifail
belaran@966: hg commit -m 'Attempt to commit a failed merge'
belaran@966: 
belaran@966: #$ name: list
belaran@966: hg resolve -l