still relevant

hg init a
hg clone a b
cd a
mkdir dir
touch dir/a
hg ci -Am m

cd ../b
touch dir
hg ci -Am m
hg pull ../a
hg merge

cd ../a
hg pull ../b
hg merge