Mercurial > hgbook
annotate ja/examples/tour-merge-conflict.pull.out @ 290:b0db5adf11c1 ja_root
fork Japanese translation.
author | Yoshiki Yazawa <yaz@cc.rim.or.jp> |
---|---|
date | Wed, 06 Feb 2008 17:43:11 +0900 |
parents | en/examples/tour-merge-conflict.pull.out@006bbad1f190 |
children |
rev | line source |
---|---|
144
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
1 $ \textbf{cd ..} |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
2 $ \textbf{hg clone scam-cousin scam-merge} |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
4 $ \textbf{cd scam-merge} |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
5 $ \textbf{hg pull -u ../scam-son} |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
6 pulling from ../scam-son |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
7 searching for changes |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
8 adding changesets |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
9 adding manifests |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
10 adding file changes |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
11 added 1 changesets with 1 changes to 1 files (+1 heads) |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
12 not updating, since new heads added |
006bbad1f190
Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
13 (run 'hg heads' to see heads, 'hg merge' to merge) |