hgbook

annotate en/undo-manual-merge.dot @ 385:0abd3d78172e

find changesets by author, revision, files, or words in the commit message
finished translation of a figure

translated a few paragraphs of tour-merge
author Javier Rojas <jerojasro@devnull.li>
date Sun Nov 02 13:54:42 2008 -0500 (2008-11-02)
parents
children
rev   line source
bos@124 1 digraph undo_manual {
bos@124 2 "first change" -> "second change";
bos@124 3 "second change" -> "third change";
bos@124 4 backout [label="back out\nsecond change", shape=box];
bos@124 5 "second change" -> backout;
bos@124 6 "third change" -> "manual\nmerge";
bos@124 7 backout -> "manual\nmerge";
bos@124 8 }