Mercurial > hgbook
view en/examples/ch04/resolve @ 773:3b640272a966
Progres on resolve
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Sun, 12 Apr 2009 00:05:30 -0700 |
parents | |
children |
line wrap: on
line source
#$ name: init hg init conflict cd conflict echo first > myfile.txt hg ci -A -m first cd .. hg clone conflict left hg clone conflict right #$ name: left cd left echo left >> myfile.txt hg ci -m left #$ name: right cd ../right echo right >> myfile.txt hg ci -m right #$ name: pull cd ../conflict hg pull -u ../left hg pull -u ../right #$ name: heads hg heads #$ name: export export HGMERGE=merge #$ name: merge hg merge #$ name: cifail hg commit -m 'Attempt to commit a failed merge' #$ name: list hg resolve -l