Mercurial > hgbook
annotate ja/examples/branch-named.update-bar.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/branch-named.update-bar.out@6519f3b983b4 |
children |
rev | line source |
---|---|
206
6519f3b983b4
More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
1 $ \textbf{hg update bar} |
6519f3b983b4
More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
2 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes |
6519f3b983b4
More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
3 $ \textbf{hg update -C bar} |
6519f3b983b4
More material about named branches.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
4 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |