Mercurial > hgbook
view ja/examples/branch-repo.merge.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-repo.merge.out@58e3a6c76725 |
children |
line wrap: on
line source
$ \textbf{hg merge} 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ \textbf{hg commit -m 'Merge bugfix from 1.0.1 branch'} $ \textbf{hg push} pushing to searching for changes adding changesets adding manifests adding file changes added 2 changesets with 1 changes to 1 files