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