view en/examples/results/tour-merge-conflict.pull.out @ 729:ccda4952e5f3

Update Chinese translation
author Dongsheng Song <dongsheng.song@gmail.com>
date Thu, 12 Mar 2009 17:12:18 +0800
parents 0d5935744f87
children 4432ad34b8e5
line wrap: on
line source

<screen><prompt>$</prompt> <userinput>cd ..</userinput>
<prompt>$</prompt> <userinput>hg clone scam-cousin scam-merge</userinput>
updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
<prompt>$</prompt> <userinput>cd scam-merge</userinput>
<prompt>$</prompt> <userinput>hg pull -u ../scam-son</userinput>
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)
</screen>