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