hgbook
diff es/tour-merge.tex @ 381:7ca1186c422f
testing push
author | Javier Rojas <jerojasro@devnull.li> |
---|---|
date | Wed Oct 29 23:47:29 2008 -0500 (2008-10-29) |
parents | 7e52f0cc4516 |
children | 772b30049b80 |
line diff
1.1 --- a/es/tour-merge.tex Sat Oct 18 15:44:41 2008 -0500 1.2 +++ b/es/tour-merge.tex Wed Oct 29 23:47:29 2008 -0500 1.3 @@ -1,6 +1,7 @@ 1.4 -\chapter{A tour of Mercurial: merging work} 1.5 +\chapter{Una gira de Mercurial: fusionar trabajo} 1.6 \label{chap:tour-merge} 1.7 1.8 +Hasta ahora hemos cubierto cómo clonar un repositorio 1.9 We've now covered cloning a repository, making changes in a 1.10 repository, and pulling or pushing changes from one repository into 1.11 another. Our next step is \emph{merging} changes from separate