Mercurial > hgbook
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 289:7be02466421b | 290:b0db5adf11c1 |
|---|---|
| 1 $ \textbf{cd ..} | |
| 2 $ \textbf{hg clone scam-cousin scam-merge} | |
| 3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 4 $ \textbf{cd scam-merge} | |
| 5 $ \textbf{hg pull -u ../scam-son} | |
| 6 pulling from ../scam-son | |
| 7 searching for changes | |
| 8 adding changesets | |
| 9 adding manifests | |
| 10 adding file changes | |
| 11 added 1 changesets with 1 changes to 1 files (+1 heads) | |
| 12 not updating, since new heads added | |
| 13 (run 'hg heads' to see heads, 'hg merge' to merge) |