hgbook
view ja/examples/branch-repo.merge.out @ 993:71dbda516572
French translation : merge with Jean Marie Clement's work on ch04-concepts
| author | Frédéric Bouquet <youshe.jaalon@gmail.com> |
|---|---|
| date | Fri Sep 11 14:35:36 2009 +0200 (2009-09-11) |
| parents | |
| children |
line source
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