hgbook

diff it/figs/bad-merge-3.dot @ 910:5d10677c3dbd

find changesets by author, revision, files, or words in the commit message
Align the comments themselves and the comment form to the left.
author dukebody <dukebody@gmail.com>
date Mon Oct 26 21:50:49 2009 +0100 (2009-10-26)
parents ea5ae4dd787b
children 719b03ea27c8
line diff
     1.1 --- a/it/figs/bad-merge-3.dot	Tue Aug 18 17:19:30 2009 +0200
     1.2 +++ b/it/figs/bad-merge-3.dot	Mon Oct 26 21:50:49 2009 +0100
     1.3 @@ -1,5 +1,5 @@
     1.4  digraph bad_merge_3 {
     1.5 -	ancestor [label="1: antenato",color="#bbbbbb",fontcolor="#bbbbbb"];
     1.6 +	ancestor [label="1: progenitore",color="#bbbbbb",fontcolor="#bbbbbb"];
     1.7  	left [label="2: mia modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
     1.8  	right [label="3: vostra modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
     1.9  	bad [label="4: unione sbagliata",color="#bbbbbb",fontcolor="#bbbbbb"];