hgbook
diff en/tour-merge.tex @ 380:1a4b507935de
began translation of tour-merge
author | Javier Rojas <jerojasro@devnull.li> |
---|---|
date | Wed Oct 29 00:37:55 2008 -0500 (2008-10-29) |
parents | d9d29e7cf5bd |
children | e602d061c078 |
line diff
1.1 --- a/en/tour-merge.tex Wed Jun 06 22:11:32 2007 +1000 1.2 +++ b/en/tour-merge.tex Wed Oct 29 00:37:55 2008 -0500 1.3 @@ -1,10 +1,10 @@ 1.4 -\chapter{A tour of Mercurial: merging work} 1.5 +\chapter{Una gira de Mercurial: fusionar trabajo} 1.6 \label{chap:tour-merge} 1.7 1.8 -We've now covered cloning a repository, making changes in a 1.9 -repository, and pulling or pushing changes from one repository into 1.10 -another. Our next step is \emph{merging} changes from separate 1.11 -repositories. 1.12 +Hasta ahora hemos cubierto cómo clonar un repositorio, hacer cambios 1.13 +en el mismo, y jalar o empujar cambios de un repositorio a otro. 1.14 +Nuestro siguiente paso es \emph{fusionar} cambios de repositorios 1.15 +separados. 1.16 1.17 \section{Merging streams of work} 1.18