# HG changeset patch
# User Javier Rojas <jerojasro@devnull.li>
# Date 1225342049 18000
# Node ID 7ca1186c422fa64e8f3cde40e9d07b937a3580de
# Parent  1a4b507935de684126f488b50f8c8571cd57f08b
testing push

diff -r 1a4b507935de -r 7ca1186c422f es/tour-merge.tex
--- a/es/tour-merge.tex	Wed Oct 29 00:37:55 2008 -0500
+++ b/es/tour-merge.tex	Wed Oct 29 23:47:29 2008 -0500
@@ -1,6 +1,7 @@
-\chapter{A tour of Mercurial: merging work}
+\chapter{Una gira de Mercurial: fusionar trabajo}
 \label{chap:tour-merge}
 
+Hasta ahora hemos cubierto cómo clonar un repositorio
 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