# HG changeset patch
# User Javier Rojas <jerojasro@devnull.li>
# Date 1225258675 18000
# Node ID 1a4b507935de684126f488b50f8c8571cd57f08b
# Parent  dbc78b312fc07dc06e6d4b517ce8a068c04b4eff
began translation of tour-merge

diff -r dbc78b312fc0 -r 1a4b507935de en/tour-merge.tex
--- 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}
 
diff -r dbc78b312fc0 -r 1a4b507935de es/Leame.1st
--- 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'''  ||