Mercurial > hgbook
changeset 479:1a4b507935de
began translation of tour-merge
| author | Javier Rojas <jerojasro@devnull.li> |
|---|---|
| date | Wed, 29 Oct 2008 00:37:55 -0500 |
| parents | dbc78b312fc0 |
| children | 7ca1186c422f |
| files | en/tour-merge.tex es/Leame.1st |
| diffstat | 2 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/en/tour-merge.tex Mon Oct 27 23:29:24 2008 -0500 +++ b/en/tour-merge.tex Wed Oct 29 00:37:55 2008 -0500 @@ -1,10 +1,10 @@ -\chapter{A tour of Mercurial: merging work} +\chapter{Una gira de Mercurial: fusionar trabajo} \label{chap:tour-merge} -We've now covered cloning a repository, making changes in a -repository, and pulling or pushing changes from one repository into -another. Our next step is \emph{merging} changes from separate -repositories. +Hasta ahora hemos cubierto cómo clonar un repositorio, hacer cambios +en el mismo, y jalar o empujar cambios de un repositorio a otro. +Nuestro siguiente paso es \emph{fusionar} cambios de repositorios +separados. \section{Merging streams of work}
--- a/es/Leame.1st Mon Oct 27 23:29:24 2008 -0500 +++ b/es/Leame.1st Wed Oct 29 00:37:55 2008 -0500 @@ -99,7 +99,8 @@ || preface.tex || Javier Rojas || 100% || 18/10/2008 || 19/10/2008 || || daily.tex || Igor Támara || 100% || 19/10/2008 || 26/10/2008 || || tour-basic.tex || Javier Rojas || 100% || 19/10/2008 || 27/10/2008 || -|| undo.tex || Igor Támara || 15% || 26/10/2008 || || +|| undo.tex || Igor Támara || 15% || 26/10/2008 || || +|| tour-merge.tex || Javier Rojas || 2% || 28/10/2008 || || == Archivos en proceso de revisión == ||'''archivo''' || '''revisor''' ||'''Estado'''||'''Inicio'''|| '''Fin''' ||