diff tests/test-merge6.out @ 7561:fa23d169a895

patch: kill some trailing whitespace
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Sat, 03 Jan 2009 20:33:37 +0100
parents 0750f11152fe
children a3d73b3e1f8a
line wrap: on
line diff