hgbook

diff es/undo-manual-merge.dot @ 890:2887b61fa4fe

find changesets by author, revision, files, or words in the commit message
Change fields to fieldsets in the Comment admin model. The 'date'
field isn't working properly for an unknown reason, so it has been
removed from the interface temporarily.
author dukebody <dukebody@gmail.com>
date Sun Oct 11 21:12:46 2009 +0200 (2009-10-11)
parents 7e52f0cc4516
children
line diff
     1.1 --- a/es/undo-manual-merge.dot	Sat Oct 18 15:44:41 2008 -0500
     1.2 +++ b/es/undo-manual-merge.dot	Sun Oct 11 21:12:46 2009 +0200
     1.3 @@ -1,8 +1,8 @@
     1.4  digraph undo_manual {
     1.5 -	"first change" -> "second change";
     1.6 -	"second change" -> "third change";
     1.7 -	backout [label="back out\nsecond change", shape=box];
     1.8 -	"second change" -> backout;
     1.9 -	"third change" -> "manual\nmerge";
    1.10 -	backout -> "manual\nmerge";
    1.11 +	"primer cambio" -> "segundo cambio";
    1.12 +	"segundo cambio" -> "tercer cambio";
    1.13 +	reversar [label="reversar\nsegundo cambio", shape=box];
    1.14 +	"segundo cambio" -> reversar;
    1.15 +	"tercer cambio" -> "fusión\nmanual";
    1.16 +	reversar -> "fusión\nmanual";
    1.17  }