diff tests/test-merge8.out @ 4118:bb70d5fa02ae

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 27 Feb 2007 16:47:16 -0600
parents 9103dab96093
children 4787e2b0dd03
line wrap: on
line diff