Mercurial > hgbook
view ja/figs/bad-merge-2.dot @ 838:d1f676a6a4b3 default tip
update mq chapter.
propagate ef53d025f410.
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Thu, 03 Dec 2009 01:26:08 +0900 |
parents | d819bc2414f4 |
children |
line wrap: on
line source
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"]; }