foozy@708: # See http://www.selenic.com/mercurial/bts/issue455
foozy@708: $ \textbf{cd ../orig}
foozy@708: $ \textbf{hg pull -u ../anne}
foozy@708: pulling from ../anne
foozy@708: searching for changes
foozy@708: adding changesets
foozy@708: adding manifests
foozy@708: adding file changes
foozy@708: added 1 changesets with 1 changes to 1 files
foozy@708: 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
foozy@708: $ \textbf{hg pull ../bob}
foozy@708: pulling from ../bob
foozy@708: searching for changes
foozy@708: adding changesets
foozy@708: adding manifests
foozy@708: adding file changes
foozy@708: added 1 changesets with 1 changes to 1 files (+1 heads)
foozy@708: (run 'hg heads' to see heads, 'hg merge' to merge)
foozy@708: $ \textbf{hg merge}
foozy@708: warning: detected divergent renames of foo to:
foozy@708:  bar
foozy@708:  quux
foozy@708: 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
foozy@708: (branch merge, don't forget to commit)
foozy@708: $ \textbf{ls}
foozy@708: bar  quux