Mercurial > hgbook

diff es/undo-manual-merge.dot @ 436:0aa96b0ffb65

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Spanish version able to generate pdf and html
author Igor TAmara <igor@tamarapatino.org>
date Sun, 19 Oct 2008 04:31:49 -0500
parents 7e52f0cc4516
children
line wrap: on
line diff
--- a/es/undo-manual-merge.dot	Sat Oct 18 15:44:41 2008 -0500
+++ b/es/undo-manual-merge.dot	Sun Oct 19 04:31:49 2008 -0500
@@ -1,8 +1,8 @@
 digraph undo_manual {
-	"first change" -> "second change";
-	"second change" -> "third change";
-	backout [label="back out\nsecond change", shape=box];
-	"second change" -> backout;
-	"third change" -> "manual\nmerge";
-	backout -> "manual\nmerge";
+	"primer cambio" -> "segundo cambio";
+	"segundo cambio" -> "tercer cambio";
+	reversar [label="reversar\nsegundo cambio", shape=box];
+	"segundo cambio" -> reversar;
+	"tercer cambio" -> "fusión\nmanual";
+	reversar -> "fusión\nmanual";
 }