diff tests/test-merge8.out @ 9324:19d07553d1b2

Merge backout of 26fa0e31011d
author Brendan Cully <brendan@kublai.com>
date Wed, 05 Aug 2009 22:52:35 -0700
parents 0750f11152fe
children a3d73b3e1f8a
line wrap: on
line diff