Mercurial > hgbook

comparison es/tour-merge.tex @ 480:7ca1186c422f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
testing push
author Javier Rojas <jerojasro@devnull.li>
date Wed, 29 Oct 2008 23:47:29 -0500
parents 7e52f0cc4516
children 772b30049b80
comparison
equal deleted inserted replaced
479:1a4b507935de 480:7ca1186c422f
1 \chapter{A tour of Mercurial: merging work} 1 \chapter{Una gira de Mercurial: fusionar trabajo}
2 \label{chap:tour-merge} 2 \label{chap:tour-merge}
3 3
4 Hasta ahora hemos cubierto cómo clonar un repositorio
4 We've now covered cloning a repository, making changes in a 5 We've now covered cloning a repository, making changes in a
5 repository, and pulling or pushing changes from one repository into 6 repository, and pulling or pushing changes from one repository into
6 another. Our next step is \emph{merging} changes from separate 7 another. Our next step is \emph{merging} changes from separate
7 repositories. 8 repositories.
8 9