Mercurial > hgbook
view 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 |
line wrap: on
line source
$ \textbf{hg merge} 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ \textbf{hg commit -m 'Merge bugfix from 1.0.1 branch'} $ \textbf{hg push} pushing to searching for changes adding changesets adding manifests adding file changes added 2 changesets with 1 changes to 1 files