Mercurial > hgbook

view ja/examples/tour-merge-conflict.pull.out @ 834:896ab6eaf1c6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merged
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Fri, 10 Jul 2009 02:32:17 +0900
parents b0db5adf11c1
children
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)