annotate en/examples/branch-repo.merge.out @ 618:a529952fce96
changed "un tag" to "una etiqueta". Same thing for
"unos tags"
"un tag"
"el tag"
"los tags"
"de tag"
"de tags"
author |
Javier Rojas <jerojasro@devnull.li> |
date |
Sun, 18 Jan 2009 22:21:43 -0500 |
parents |
58e3a6c76725 |
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
|