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

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