diff tests/test-merge6.out @ 5202:1108c952cca1

Merge with -stable
author Matt Mackall <mpm@selenic.com>
date Sun, 19 Aug 2007 14:04:26 -0500
parents b2ae81a7df29
children 8feb33c2d153
line wrap: on
line diff