Mercurial > hgbook

view en/examples/tour-merge-conflict.pull.out @ 575:cf6b9bf14af7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
corrected some typos, added a note about the meaning of a sentence
author Javier Rojas <jerojasro@devnull.li>
date Wed, 31 Dec 2008 11:44:58 -0500
parents e281bd9a8e47
children
line wrap: on
line source

$ \textbf{cd ..}
$ \textbf{hg clone scam-cousin scam-merge}
updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ \textbf{cd scam-merge}
$ \textbf{hg pull -u ../scam-son}
pulling from ../scam-son
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
not updating, since new heads added
(run 'hg heads' to see heads, 'hg merge' to merge)