Mercurial > hgbook
changeset 481:e602d061c078
reverted translation on wrong file. Silly sleepy me
| author | Javier Rojas <jerojasro@devnull.li> |
|---|---|
| date | Wed, 29 Oct 2008 23:55:09 -0500 |
| parents | 7ca1186c422f |
| children | 772b30049b80 |
| files | en/tour-merge.tex |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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}