Mercurial > hgbook
annotate ja/examples/branch-repo.merge.out @ 779:69923723e7f9
more hook.tex
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Mon, 27 Apr 2009 17:31:54 +0900 |
parents | b0db5adf11c1 |
children |
rev | line source |
---|---|
199 | 1 $ \textbf{hg merge} |
2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
3 (branch merge, don't forget to commit) | |
4 $ \textbf{hg commit -m 'Merge bugfix from 1.0.1 branch'} | |
5 $ \textbf{hg push} | |
6 pushing to | |
7 searching for changes | |
8 adding changesets | |
9 adding manifests | |
10 adding file changes | |
11 added 2 changesets with 1 changes to 1 files |