diff tests/test-merge-local.out @ 6721:521c6c6f3b9b

kill some trailing spaces
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Mon, 23 Jun 2008 13:12:32 +0200
parents 92ccccb55ba3
children a964ab624385
line wrap: on
line diff