hgbook
changeset 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 | dbc78b312fc0 |
children | 7ca1186c422f |
files | en/tour-merge.tex es/Leame.1st |
line diff
1.1 --- a/en/tour-merge.tex Mon Oct 27 23:29:24 2008 -0500 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
2.1 --- a/es/Leame.1st Mon Oct 27 23:29:24 2008 -0500 2.2 +++ b/es/Leame.1st Wed Oct 29 00:37:55 2008 -0500 2.3 @@ -99,7 +99,8 @@ 2.4 || preface.tex || Javier Rojas || 100% || 18/10/2008 || 19/10/2008 || 2.5 || daily.tex || Igor Támara || 100% || 19/10/2008 || 26/10/2008 || 2.6 || tour-basic.tex || Javier Rojas || 100% || 19/10/2008 || 27/10/2008 || 2.7 -|| undo.tex || Igor Támara || 15% || 26/10/2008 || || 2.8 +|| undo.tex || Igor Támara || 15% || 26/10/2008 || || 2.9 +|| tour-merge.tex || Javier Rojas || 2% || 28/10/2008 || || 2.10 2.11 == Archivos en proceso de revisión == 2.12 ||'''archivo''' || '''revisor''' ||'''Estado'''||'''Inicio'''|| '''Fin''' ||