diff tests/test-merge6.out @ 5208:cf9226452db7

Merge with -crew
author Matt Mackall <mpm@selenic.com>
date Mon, 20 Aug 2007 21:14:53 -0500
parents b2ae81a7df29
children 8feb33c2d153
line wrap: on
line diff