diff tests/test-merge8.out @ 6391:a1007f7b9b7b

Backed out changeset d2bb66a8a435 (temporary template compatibility)
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Mon, 24 Mar 2008 18:18:39 +0100
parents 0750f11152fe
children a3d73b3e1f8a
line wrap: on
line diff