hgbook-it / it / figs / bad-merge-1.dot

Diff from to

it/figs/bad-merge-1.dot

 digraph bad_merge_1 {
-	ancestor [label="1: antenato"];
+	ancestor [label="1: progenitore"];
 	left [label="2: mia modifica"];
 	right [label="3: vostra modifica"];
 	bad [label="4: unione sbagliata"];
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.