bos@680: digraph bad_merge_1 { bos@680: ancestor [label="1: ancestor"]; bos@680: left [label="2: my change"]; bos@680: right [label="3: your change"]; bos@680: bad [label="4: bad merge"]; bos@680: new [label="5: new change"]; bos@680: bos@680: ancestor -> left; bos@680: ancestor -> right; bos@680: left -> bad; bos@680: right -> bad; bos@680: bad -> new; bos@680: }