Mercurial > hgbook

changeset 480:7ca1186c422f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
testing push
author Javier Rojas <jerojasro@devnull.li>
date Wed, 29 Oct 2008 23:47:29 -0500
parents 1a4b507935de
children e602d061c078
files es/tour-merge.tex
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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