hgbook / en / examples / ch04 / resolve

#$ 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=false

#$ name: merge
hg merge

#$ name: cifail
hg commit -m 'Attempt to commit a failed merge'

#$ name: list
hg resolve -l
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.