Mercurial > hgbook
view en/examples/results/tour-merge-conflict.pull.out @ 662:44d1363234d2
Move example output files into examples/results
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon, 09 Mar 2009 21:37:47 -0700 |
parents | en/examples/tour-merge-conflict.pull.out@e281bd9a8e47 |
children | 0d5935744f87 |
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)