Mercurial > hgbook

view en/examples/tour.merge.merge.out @ 618:a529952fce96

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 006bbad1f190
children
line wrap: on
line source

$ \textbf{hg merge}
merging hello.c
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)