hgbook

annotate en/feature-branches.dot @ 302:e281bd9a8e47

Fix sample output for test 'tour-merge-conflict'.
Fix test itself as well (now requires 'hg resolve').
author Guido Ostkamp <hg@ostkamp.fastmail.fm>
date Wed Aug 20 22:00:46 2008 +0200 (2008-08-20)
parents
children
rev   line source
bos@179 1 digraph feature_branches {
bos@179 2 master -> crypto;
bos@179 3 master -> filesystems;
bos@179 4 master -> ipc;
bos@179 5 master -> memory;
bos@179 6 master -> network;
bos@179 7 master -> security;
bos@179 8 }