hgbook / fr / figs /

digraph bad_merge_2 {
	ancestor [label="1: ancestor",color=grey,fontcolor=grey];
	left [label="2: my change",color=grey,fontcolor=grey];
	right [label="3: your change",color=grey,fontcolor=grey];
	bad [label="4: bad merge",color=grey,fontcolor=grey];
	new [label="5: new change",color=grey,fontcolor=grey];

	bak_left [label="6: backout 1 of\nbad merge",shape=box];

	ancestor -> left [color=grey];
	ancestor -> right [color=grey];
	left -> bad [color=grey];
	right -> bad [color=grey];
	bad -> new [color=grey];

	bad -> bak_left;
	left -> bak_left [style=dotted,label="--parent=2"];
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
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.