annotate en/examples/branch-repo.merge.out @ 386:d2467817c934
some paragraphs translated to spanish
| author |
Igor TAmara <igor@tamarapatino.org> |
| date |
Sun Nov 02 14:23:01 2008 -0500 (2008-11-02) |
| parents |
|
| children |
|
| rev |
line source |
|
bos@199
|
1 $ \textbf{hg merge}
|
|
bos@199
|
2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
bos@199
|
3 (branch merge, don't forget to commit)
|
|
bos@199
|
4 $ \textbf{hg commit -m 'Merge bugfix from 1.0.1 branch'}
|
|
bos@199
|
5 $ \textbf{hg push}
|
|
bos@199
|
6 pushing to
|
|
bos@199
|
7 searching for changes
|
|
bos@199
|
8 adding changesets
|
|
bos@199
|
9 adding manifests
|
|
bos@199
|
10 adding file changes
|
|
bos@199
|
11 added 2 changesets with 1 changes to 1 files
|
