hgbook
view en/examples/branch-repo.merge.out @ 472:6880f9c8e7e7
Automated merge with http://mercurial.intuxication.org/hg/mercurial_book_es
| author | Igor Támara <igor@tamarapatino.org> |
|---|---|
| date | Sun Dec 28 00:30:26 2008 -0500 (2008-12-28) |
| 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