hgbook
diff es/undo-manual-merge.dot @ 336:7e52f0cc4516
changed es/hgext.tex
changed es/hook.tex
changed es/kdiff3.png
changed es/license.tex
changed es/mq-collab.tex
changed es/mq-ref.tex
changed es/mq.tex
changed es/note.png
changed es/tour-merge.tex
changed es/undo-manual-merge.dot
changed es/undo-non-tip.dot
files needed to compile the pdf version of the book.
changed es/hook.tex
changed es/kdiff3.png
changed es/license.tex
changed es/mq-collab.tex
changed es/mq-ref.tex
changed es/mq.tex
changed es/note.png
changed es/tour-merge.tex
changed es/undo-manual-merge.dot
changed es/undo-non-tip.dot
files needed to compile the pdf version of the book.
author | jerojasro@localhost |
---|---|
date | Sat Oct 18 15:44:41 2008 -0500 (2008-10-18) |
parents | en/undo-manual-merge.dot@c9aad709bd3a |
children | 0aa96b0ffb65 |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/es/undo-manual-merge.dot Sat Oct 18 15:44:41 2008 -0500 1.3 @@ -0,0 +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 +}