# HG changeset patch
# User Javier Rojas <jerojasro@devnull.li>
# Date 1225342509 18000
# Node ID e602d061c078b5990a429c25f3b9acc91be8f69a
# Parent  7ca1186c422fa64e8f3cde40e9d07b937a3580de
reverted translation on wrong file. Silly sleepy me

diff -r 7ca1186c422f -r e602d061c078 en/tour-merge.tex
--- a/en/tour-merge.tex	Wed Oct 29 23:47:29 2008 -0500
+++ b/en/tour-merge.tex	Wed Oct 29 23:55:09 2008 -0500
@@ -1,10 +1,10 @@
-\chapter{Una gira de Mercurial: fusionar trabajo}
+\chapter{A tour of Mercurial: merging work}
 \label{chap:tour-merge}
 
-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.
+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.
 
 \section{Merging streams of work}