view en/examples/tour-merge-conflict.pull.out @ 530:f809de31887a

more translation :D added a term to the glossary
author jerojasro@localhost
date Sun, 30 Nov 2008 18:41:51 -0500 (2008-11-30)
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)