diff tests/test-merge1 @ 4923:e8c0b52c363c

Better fix for issue 622 than we had in c4dd58af0fc8.
author Bryan O'Sullivan <bos@serpentine.com>
date Wed, 18 Jul 2007 13:56:08 -0700
parents ccfe423d3d0a
children
line wrap: on
line diff