hgbook

changeset 382:e602d061c078

reverted translation on wrong file. Silly sleepy me
author Javier Rojas <jerojasro@devnull.li>
date Wed Oct 29 23:55:09 2008 -0500 (2008-10-29)
parents 7ca1186c422f
children 772b30049b80
files en/tour-merge.tex
line diff
     1.1 --- a/en/tour-merge.tex	Wed Oct 29 23:47:29 2008 -0500
     1.2 +++ b/en/tour-merge.tex	Wed Oct 29 23:55:09 2008 -0500
     1.3 @@ -1,10 +1,10 @@
     1.4 -\chapter{Una gira de Mercurial: fusionar trabajo}
     1.5 +\chapter{A tour of Mercurial: merging work}
     1.6  \label{chap:tour-merge}
     1.7  
     1.8 -Hasta ahora hemos cubierto cómo clonar un repositorio, hacer cambios
     1.9 -en el mismo, y jalar o empujar cambios de un repositorio a otro.
    1.10 -Nuestro siguiente paso es \emph{fusionar} cambios de repositorios
    1.11 -separados.
    1.12 +We've now covered cloning a repository, making changes in a
    1.13 +repository, and pulling or pushing changes from one repository into
    1.14 +another.  Our next step is \emph{merging} changes from separate
    1.15 +repositories.
    1.16  
    1.17  \section{Merging streams of work}
    1.18