diff tests/test-merge6 @ 11315:666b62c52767

test-branch-option: Updated output to match rev 3f1409082720
author Jan Sorensen <js@aragost.com>
date Wed, 09 Jun 2010 17:22:59 +0200
parents a74586023196
children
line wrap: on
line diff