diff tests/test-merge7.out @ 5593:6ae8ed59c7b4

Fix breaking test from 05451f6b5f07
author Bryan O'Sullivan <bos@serpentine.com>
date Sun, 02 Dec 2007 21:52:40 -0800
parents 17ed9b9a0d03
children 5af5f0f9d724
line wrap: on
line diff