Mercurial > hgbook
view en/examples/rename.divergent.merge.out @ 412:a168daed199b
Fix typos
author | Simon Ruderich <simon@ruderich.org> |
---|---|
date | Tue, 26 Aug 2008 13:55:04 -0700 |
parents | 00f69e8825c5 |
children |
line wrap: on
line source
# See http://www.selenic.com/mercurial/bts/issue455 $ \textbf{cd ../orig} $ \textbf{hg pull -u ../anne} pulling from ../anne searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ \textbf{hg pull ../bob} pulling from ../bob searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) $ \textbf{hg merge} warning: detected divergent renames of foo to: bar quux 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ \textbf{ls} bar quux