hgbook / fr / figs / bad-merge-4.dot

Romain Pelisse 6b680d5 
























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

	bak_left [label="6: backout 1 of\nbad merge",color=grey,fontcolor=grey,shape=box];
	bak_right [label="7: backout 2 of\nbad merge",color=grey,fontcolor=grey,shape=box];
	good [label="8: merge\nof backouts",shape=box];

	ancestor -> left [color="#bbbbbb"];
	ancestor -> right [color="#bbbbbb"];
	left -> bad [color="#bbbbbb"];
	right -> bad [color="#bbbbbb"];
	bad -> new [color="#bbbbbb"];

	bad -> bak_left [color=grey];
	left -> bak_left [style=dotted,label="--parent=2",color=grey,fontcolor=grey];

	bad -> bak_right [color=grey];
	right -> bak_right [style=dotted,label="--parent=3",color=grey,fontcolor=grey];

	bak_left -> good;
	bak_right -> good;
}
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.