Mercurial > hgbook

view en/examples/tour-merge-conflict.pull.out @ 288:cac3ac4536e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Better wording, again per Jim Blandy.
author Bryan O'Sullivan <bos@serpentine.com>
date Fri, 18 Jan 2008 12:01:46 -0800
parents 006bbad1f190
children e281bd9a8e47
line wrap: on
line source

$ \textbf{cd ..}
$ \textbf{hg clone scam-cousin scam-merge}
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)